diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 15:27:54 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 15:27:54 +0100 |
| commit | 27a2873617415f7a5b9881a532008efd92334b05 (patch) | |
| tree | 55e1d83ab16e2cfff45fe09cc12e1cd21cd78fda /drivers/pinctrl/sunxi | |
| parent | af81ba3cfdeefcb743e3f82cdbdbac8294ae6779 (diff) | |
| parent | 2956b5d94a76b596fa5057c2b3ca915cb27d7652 (diff) | |
| download | linux-27a2873617415f7a5b9881a532008efd92334b05.tar.gz linux-27a2873617415f7a5b9881a532008efd92334b05.tar.bz2 linux-27a2873617415f7a5b9881a532008efd92334b05.zip | |
Merge branch 'ib-pinctrl-genprops' into devel
Diffstat (limited to 'drivers/pinctrl/sunxi')
| -rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index a69f7588e078..aaef7f42f1e4 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -540,7 +540,7 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev, enum pin_config_param param; unsigned long flags; u32 offset, shift, mask, reg; - u16 arg, val; + u32 arg, val; int ret; param = pinconf_to_config_param(configs[i]); |