From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 8 Jun 2015 13:25:52 +0000 (+0200)
Subject: drm/sti: correctly test devm_ioremap() return
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3c8a0b2becf1015f502bf4b0f50fe18e0ed8a93;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/sti: correctly test devm_ioremap() return

In case of error, the function devm_ioremap_nocache() returns NULL
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>
---

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index a9b678af85a6..d141d645bd13 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -499,8 +499,8 @@ static int sti_dvo_probe(struct platform_device *pdev)
 	}
 	dvo->regs = devm_ioremap_nocache(dev, res->start,
 			resource_size(res));
-	if (IS_ERR(dvo->regs))
-		return PTR_ERR(dvo->regs);
+	if (!dvo->regs)
+		return -ENOMEM;
 
 	dvo->clk_pix = devm_clk_get(dev, "dvo_pix");
 	if (IS_ERR(dvo->clk_pix)) {