lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 272/667] drm/msm/hdmi: fix error check return value of irq_of_parse_and_map()
    Date
    From: Lv Ruyi <lv.ruyi@zte.com.cn>

    [ Upstream commit 03371e4fbdeb7f596cbceacb59e474248b6d95ac ]

    The irq_of_parse_and_map() function returns 0 on failure, and does not
    return a negative value anyhow, so never enter this conditional branch.

    Fixes: f6a8eaca0ea1 ("drm/msm/mdp5: use irqdomains")
    Reported-by: Zeal Robot <zealci@zte.com.cn>
    Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
    Reviewed-by: Stephen Boyd <swboyd@chromium.org>
    Patchwork: https://patchwork.freedesktop.org/patch/483294/
    Link: https://lore.kernel.org/r/20220425091831.3500487-1-lv.ruyi@zte.com.cn
    Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/hdmi/hdmi.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
    index c3d95e7af1e4..23fb88b53324 100644
    --- a/drivers/gpu/drm/msm/hdmi/hdmi.c
    +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
    @@ -319,9 +319,9 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
    drm_connector_attach_encoder(hdmi->connector, hdmi->encoder);

    hdmi->irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
    - if (hdmi->irq < 0) {
    - ret = hdmi->irq;
    - DRM_DEV_ERROR(dev->dev, "failed to get irq: %d\n", ret);
    + if (!hdmi->irq) {
    + ret = -EINVAL;
    + DRM_DEV_ERROR(dev->dev, "failed to get irq\n");
    goto fail;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 21:07    [W:3.990 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site