Commit 248f2c55 authored Jan 27, 2015 by Uwe Kleine-König Committed by Sasha Levin Mar 23, 2015

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: ae75ff81 ("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>

parent a5754abd

drivers/pinctrl/freescale/pinctrl-imx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}