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

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

diff --git a/drivers/pinctrl/pinctrl-max77620.c b/drivers/pinctrl/pinctrl-max77620.c
index d9ff53e8f715a425ae563bccfe6a7fb85bcd9679..b8d2180a2bea44426b940745c5030f60073e214e 100644 (file)
--- a/drivers/pinctrl/pinctrl-max77620.c
+++ b/drivers/pinctrl/pinctrl-max77620.c
@@ -402,7 +402,7 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
        struct device *dev = mpci->dev;
        struct max77620_fps_config *fps_config;
        int param;
-       u16 param_val;
+       u32 param_val;
        unsigned int val;
        unsigned int pu_val;
        unsigned int pd_val;