summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-08-26 12:17:36 +0200
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>2014-08-26 14:16:32 +0200
commit31f32a21aa7e31179406f82b5fb3195b83d7acc8 (patch)
tree2cc36b87ca72b87656b085a6ba64af4040f8910c /drivers
parent7963e9db1b1f842fdc53309baa8714d38e9f5681 (diff)
downloadlinux-31f32a21aa7e31179406f82b5fb3195b83d7acc8.tar.bz2
drm: sti: tvout: fix return value check in sti_tvout_probe()
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/sti/sti_tvout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index b69e26fee76e..9ad2d44d496f 100644
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -591,8 +591,8 @@ static int sti_tvout_probe(struct platform_device *pdev)
return -ENOMEM;
}
tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
- if (IS_ERR(tvout->regs))
- return PTR_ERR(tvout->regs);
+ if (!tvout->regs)
+ return -ENOMEM;
/* get reset resources */
tvout->reset = devm_reset_control_get(dev, "tvout");