summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/zte
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2017-07-01 11:45:36 +0800
committerLinus Walleij <linus.walleij@linaro.org>2017-07-31 15:13:09 +0200
commitb962e2cd357f2a529fe14387092401e6552f43d6 (patch)
tree4775ebde47fd442c1cf8329311e8cbd5ada72296 /drivers/pinctrl/zte
parent16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff)
downloadlinux-b962e2cd357f2a529fe14387092401e6552f43d6.tar.bz2
pinctrl: zte: fix dereference of 'data' in zx_set_mux()
It fixes the following Smatch complaint: drivers/pinctrl/zte/pinctrl-zx.c:76 zx_set_mux() warn: variable dereferenced before check 'data' (see line 67) Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: cbff0c4d27f4 ("pinctrl: add ZTE ZX pinctrl driver support") Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/zte')
-rw-r--r--drivers/pinctrl/zte/pinctrl-zx.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/pinctrl/zte/pinctrl-zx.c b/drivers/pinctrl/zte/pinctrl-zx.c
index 787e3967bd5c..f828ee340a98 100644
--- a/drivers/pinctrl/zte/pinctrl-zx.c
+++ b/drivers/pinctrl/zte/pinctrl-zx.c
@@ -64,10 +64,8 @@ static int zx_set_mux(struct pinctrl_dev *pctldev, unsigned int func_selector,
struct zx_pinctrl_soc_info *info = zpctl->info;
const struct pinctrl_pin_desc *pindesc = info->pins + group_selector;
struct zx_pin_data *data = pindesc->drv_data;
- struct zx_mux_desc *mux = data->muxes;
- u32 mask = (1 << data->width) - 1;
- u32 offset = data->offset;
- u32 bitpos = data->bitpos;
+ struct zx_mux_desc *mux;
+ u32 mask, offset, bitpos;
struct function_desc *func;
unsigned long flags;
u32 val, mval;
@@ -76,6 +74,11 @@ static int zx_set_mux(struct pinctrl_dev *pctldev, unsigned int func_selector,
if (!data)
return -EINVAL;
+ mux = data->muxes;
+ mask = (1 << data->width) - 1;
+ offset = data->offset;
+ bitpos = data->bitpos;
+
func = pinmux_generic_get_function(pctldev, func_selector);
if (!func)
return -EINVAL;