diff options
| author | Linus Walleij | 2017-01-26 15:27:54 +0100 |
|---|---|---|
| committer | Linus Walleij | 2017-01-26 15:27:54 +0100 |
| commit | 27a2873617415f7a5b9881a532008efd92334b05 (patch) | |
| tree | 55e1d83ab16e2cfff45fe09cc12e1cd21cd78fda /drivers/pinctrl/pinctrl-single.c | |
| parent | pinctrl: mvebu: remove unused variable (diff) | |
| parent | pinctrl / gpio: Introduce .set_config() callback for GPIO chips (diff) | |
| download | kernel-qcow2-linux-27a2873617415f7a5b9881a532008efd92334b05.tar.gz kernel-qcow2-linux-27a2873617415f7a5b9881a532008efd92334b05.tar.xz kernel-qcow2-linux-27a2873617415f7a5b9881a532008efd92334b05.zip | |
Merge branch 'ib-pinctrl-genprops' into devel
Diffstat (limited to 'drivers/pinctrl/pinctrl-single.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index d23e0e0aeb22..8b2d45e85bae 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -504,7 +504,7 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev, struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev); struct pcs_function *func; unsigned offset = 0, shift = 0, i, data, ret; - u16 arg; + u32 arg; int j; ret = pcs_get_function(pctldev, pin, &func); |