From 5e1109adde6acd0f3424886da09402ac22ed244b Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 31 Oct 2013 15:51:18 +0800
Subject: pinctrl: imx1: fix return value check in imx1_pinctrl_core_probe()

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@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/pinctrl/pinctrl-imx1-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/pinctrl/pinctrl-imx1-core.c')

diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/pinctrl-imx1-core.c
index 4d5a9e74dc8f..f77914ac081a 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,
 			resource_size(res));
-	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);
-- 
cgit v1.2.3