pinctrl: imx1: fix return value check in imx1_pinctrl_core_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 31 Oct 2013 07:51:18 +0000 (15:51 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 4 Nov 2013 11:49:56 +0000 (12:49 +0100)
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

index 4d5a9e7..f77914a 100644 (file)
@@ -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);