lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 111/671] drm/shmob: Fix return value check in shmob_drm_probe
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 06c3bbd3c12737a50c2e981821b5585e1786e73d ]

    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: 8f1597c8f1a5 ("drm: shmobile: Perform initialization/cleanup at probe/remove time")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
    Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
    Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
    index 592572554eb0..58d8a98c749b 100644
    --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
    +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
    @@ -233,8 +233,8 @@ static int shmob_drm_probe(struct platform_device *pdev)

    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    sdev->mmio = devm_ioremap_resource(&pdev->dev, res);
    - if (sdev->mmio == NULL)
    - return -ENOMEM;
    + if (IS_ERR(sdev->mmio))
    + return PTR_ERR(sdev->mmio);

    ret = shmob_drm_setup_clocks(sdev, pdata->clk_source);
    if (ret < 0)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 17:58    [W:2.310 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site