]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/hdmi: fix error check return value of irq_of_parse_and_map()
authorLv Ruyi <lv.ruyi@zte.com.cn>
Mon, 25 Apr 2022 09:18:31 +0000 (09:18 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:30:05 +0000 (10:30 +0200)
[ 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

index 07e2ad527af94fc93c2d0861fa39d2c837bae272..f6229262dcb05e9905c2ced5df7594da2a484397 100644 (file)
@@ -302,9 +302,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;
        }