diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 09:27:54 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 09:27:54 -0500 |
| commit | 27a2873617415f7a5b9881a532008efd92334b05 (patch) | |
| tree | 55e1d83ab16e2cfff45fe09cc12e1cd21cd78fda /drivers/pinctrl/sirf | |
| parent | af81ba3cfdeefcb743e3f82cdbdbac8294ae6779 (diff) | |
| parent | 2956b5d94a76b596fa5057c2b3ca915cb27d7652 (diff) | |
Merge branch 'ib-pinctrl-genprops' into devel
Diffstat (limited to 'drivers/pinctrl/sirf')
| -rw-r--r-- | drivers/pinctrl/sirf/pinctrl-atlas7.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas7.c b/drivers/pinctrl/sirf/pinctrl-atlas7.c index 76df538fa814..600d6427a978 100644 --- a/drivers/pinctrl/sirf/pinctrl-atlas7.c +++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c | |||
| @@ -5322,7 +5322,8 @@ static int atlas7_pin_config_set(struct pinctrl_dev *pctldev, | |||
| 5322 | unsigned pin, unsigned long *configs, | 5322 | unsigned pin, unsigned long *configs, |
| 5323 | unsigned num_configs) | 5323 | unsigned num_configs) |
| 5324 | { | 5324 | { |
| 5325 | u16 param, arg; | 5325 | u16 param; |
| 5326 | u32 arg; | ||
| 5326 | int idx, err; | 5327 | int idx, err; |
| 5327 | 5328 | ||
| 5328 | for (idx = 0; idx < num_configs; idx++) { | 5329 | for (idx = 0; idx < num_configs; idx++) { |