]> git.karo-electronics.de Git - linux-beck.git/commitdiff
pinctrl: pinctrl-imx: don't use invalid value of conf_reg
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 27 Jan 2015 22:50:25 +0000 (23:50 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 3 Feb 2015 12:57:52 +0000 (13:57 +0100)
The right check for conf_reg to be invalid it testing against -1 not 0
as is done in the rest of the driver.

This fixes an oops that can be triggered by:

cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*

Fixes: ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/freescale/pinctrl-imx.c

index 52f2b9404fe058354a4c056fd7f2159bcea9de32..448f10986c28499449fcb970b9376c83431ec647 100644 (file)
@@ -437,7 +437,7 @@ static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev,
        const struct imx_pin_reg *pin_reg = &info->pin_regs[pin_id];
        unsigned long config;
 
-       if (!pin_reg || !pin_reg->conf_reg) {
+       if (!pin_reg || pin_reg->conf_reg == -1) {
                seq_printf(s, "N/A");
                return;
        }