diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-01-27 23:50:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-18 14:11:12 +0100 |
| commit | b8a2454e51c75fff6a621bdb5a399aab062d956e (patch) | |
| tree | 0b8ad63d7b33b6dd5d2a02ae9f81075f39d0551f | |
| parent | 5f98283000a62ec475de3d9a3f2080d1a73e865c (diff) | |
| download | lwn-b8a2454e51c75fff6a621bdb5a399aab062d956e.tar.gz lwn-b8a2454e51c75fff6a621bdb5a399aab062d956e.zip | |
pinctrl: pinctrl-imx: don't use invalid value of conf_reg
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 52f2b9404fe0..448f10986c28 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -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; } |