diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-05-21 01:01:52 +0000 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2017-05-22 13:34:14 -0700 |
commit | 665f37e7eec33223bdc50cc1b3e00bca97a30aea (patch) | |
tree | b1490206f86b07b98d1f831d5792b2063af65b0c | |
parent | f90dee20b40089b64fdcf18dd7bf9df500f6fddd (diff) | |
download | linux-665f37e7eec33223bdc50cc1b3e00bca97a30aea.tar.gz linux-665f37e7eec33223bdc50cc1b3e00bca97a30aea.tar.bz2 linux-665f37e7eec33223bdc50cc1b3e00bca97a30aea.zip |
drm/pl111: Fix return value check in pl111_amba_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170521010152.6186-1-weiyj.lk@gmail.com
-rw-r--r-- | drivers/gpu/drm/pl111/pl111_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 97095b1aa961..e96efad37d27 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -200,9 +200,9 @@ static int pl111_amba_probe(struct amba_device *amba_dev, drm->dev_private = priv; priv->regs = devm_ioremap_resource(dev, &amba_dev->res); - if (!priv->regs) { + if (IS_ERR(priv->regs)) { dev_err(dev, "%s failed mmio\n", __func__); - return -EINVAL; + return PTR_ERR(priv->regs); } /* turn off interrupts before requesting the irq */ |