[PATCH] drm/sti: fix return value check in sti_dvo_probe()

From: weiyj_lk
Date: Thu Apr 16 2015 - 08:27:28 EST


From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/sti/sti_dvo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index aeb5070..ae4c3df 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -495,8 +495,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)) {

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/