]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/pl111: Fix return value check in pl111_amba_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Sun, 21 May 2017 01:01:52 +0000 (01:01 +0000)
committerEric Anholt <eric@anholt.net>
Mon, 22 May 2017 20:34:14 +0000 (13:34 -0700)
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
drivers/gpu/drm/pl111/pl111_drv.c

index 97095b1aa9612d0b83a5ea2762cac1f2846b39be..e96efad37d274fc5ced3310e71bd8f9a7514eb81 100644 (file)
@@ -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 */