Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / pinctrl-palmas.c

diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index a30146da7ffdcb6a72513b87d692a49527a5d16c..4d6a5015b9272f335d8738c072e27cd0eec56f9b 100644 (file)
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -860,7 +860,7 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev,
 {
        struct palmas_pctrl_chip_info *pci = pinctrl_dev_get_drvdata(pctldev);
        enum pin_config_param param;
-       u16 param_val;
+       u32 param_val;
        const struct palmas_pingroup *g;
        const struct palmas_pin_info *opt;
        int ret;