[PATCH -next] pinctrl: imx1: fix return value check in imx1_pinctrl_core_probe()

From: Wei Yongjun
Date: Thu Oct 31 2013 - 03:51:24 EST

From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>

In case of error, the function devm_ioremap_nocache() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
drivers/pinctrl/pinctrl-imx1-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/pinctrl-imx1-core.c
index 4d5a9e7..f77914a 100644
--- a/drivers/pinctrl/pinctrl-imx1-core.c
+++ b/drivers/pinctrl/pinctrl-imx1-core.c
@@ -615,8 +615,8 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev,

ipctl->base = devm_ioremap_nocache(&pdev->dev, res->start,
- if (IS_ERR(ipctl->base))
- return PTR_ERR(ipctl->base);
+ if (!ipctl->base)
+ return -ENOMEM;

pctl_desc = &imx1_pinctrl_desc;
pctl_desc->name = dev_name(&pdev->dev);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/