aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2015-06-08 09:25:52 -0400
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>2015-06-08 09:28:10 -0400
commitd3c8a0b2becf1015f502bf4b0f50fe18e0ed8a93 (patch)
tree39e6d4e81633843007564602407dd239cac8c33b
parentae45577324d1f749c907840247d443696ac3bc7a (diff)
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>
-rw-r--r--drivers/gpu/drm/sti/sti_dvo.c4
1 files changed, 2 insertions, 2 deletions
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)
499 } 499 }
500 dvo->regs = devm_ioremap_nocache(dev, res->start, 500 dvo->regs = devm_ioremap_nocache(dev, res->start,
501 resource_size(res)); 501 resource_size(res));
502 if (IS_ERR(dvo->regs)) 502 if (!dvo->regs)
503 return PTR_ERR(dvo->regs); 503 return -ENOMEM;
504 504
505 dvo->clk_pix = devm_clk_get(dev, "dvo_pix"); 505 dvo->clk_pix = devm_clk_get(dev, "dvo_pix");
506 if (IS_ERR(dvo->clk_pix)) { 506 if (IS_ERR(dvo->clk_pix)) {