drm: sti: hdmi: fix return value check in sti_hdmi_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 26 Aug 2014 10:23:07 +0000 (12:23 +0200)
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>
Tue, 26 Aug 2014 12:16:39 +0000 (14:16 +0200)
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>
drivers/gpu/drm/sti/sti_hdmi.c

index 284e541d970d8a1ec2213d2479f3d0f7c29176f7..8319f764c18e2cb429dde0b0c424e384a7cef048 100644 (file)
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
        hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
-       if (IS_ERR(hdmi->regs))
-               return PTR_ERR(hdmi->regs);
+       if (!hdmi->regs)
+               return -ENOMEM;
 
        if (of_device_is_compatible(np, "st,stih416-hdmi")) {
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
                }
                hdmi->syscfg = devm_ioremap_nocache(dev, res->start,
                                                    resource_size(res));
-               if (IS_ERR(hdmi->syscfg))
-                       return PTR_ERR(hdmi->syscfg);
+               if (!hdmi->syscfg)
+                       return -ENOMEM;
 
        }