lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 188/274] drm/mcde: dsi: Fix return value check in mcde_dsi_bind()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 761e9f4f80a21a4b845097027030bef863001636 ]

    The of_drm_find_bridge() function returns NULL on error, it doesn't return
    error pointers so this check doesn't work.

    Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200430073145.52321-1-weiyongjun1@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/mcde/mcde_dsi.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c
    index 7af5ebb0c436..e705afc08c4e 100644
    --- a/drivers/gpu/drm/mcde/mcde_dsi.c
    +++ b/drivers/gpu/drm/mcde/mcde_dsi.c
    @@ -1073,10 +1073,9 @@ static int mcde_dsi_bind(struct device *dev, struct device *master,
    panel = NULL;

    bridge = of_drm_find_bridge(child);
    - if (IS_ERR(bridge)) {
    - dev_err(dev, "failed to find bridge (%ld)\n",
    - PTR_ERR(bridge));
    - return PTR_ERR(bridge);
    + if (!bridge) {
    + dev_err(dev, "failed to find bridge\n");
    + return -EINVAL;
    }
    }
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:52    [W:6.966 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site