]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 2 Mar 2015 15:04:41 +0000 (15:04 +0000)
commit 4ff0f034e95d65f8f063a362dfcf86e986377a82 upstream.

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>
[ luis: backported to 3.16:
  - file rename: drivers/pinctrl/freescale/pinctrl-imx.c ->
    drivers/pinctrl/pinctrl-imx.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/pinctrl/pinctrl-imx.c

index a24448e5d3996ee81a490710545626be8c83f0a2..6cd65e6987e446db7bca74e34717f28ae327fdc9 100644 (file)
@@ -365,7 +365,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;
        }