-----Original Message-----
From: Sasha Levin <sashal@kernel.org>
Sent: Monday, June 28, 2021 7:17 AM
To: linux-kernel@vger.kernel.org; stable@vger.kernel.org
Cc: Zhen Lei <redacted>; Hulk Robot
[off-list ref]; Chrisanthus, Anitha [off-list ref];
Sasha Levin [off-list ref]
Subject: [PATCH 5.12 019/110] drm/kmb: Fix error return code in
kmb_hw_init()

From: Zhen Lei <redacted>

[ Upstream commit 6fd8f323b3e4e5290d02174559308669507c00dd ]

When the call to platform_get_irq() to obtain the IRQ of the lcd fails, the
returned error code should be propagated. However, we currently do not
explicitly assign this error code to 'ret'. As a result, 0 was incorrectly
returned.

Fixes: 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Zhen Lei <redacted>
Signed-off-by: Anitha Chrisanthus <anitha.chrisanthus@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210513134639.6541-
1-thunder.leizhen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/kmb/kmb_drv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/kmb/kmb_drv.c

b/drivers/gpu/drm/kmb/kmb_drv.c
index f64e06e1067d..96ea1a2c11dd 100644

--- a/drivers/gpu/drm/kmb/kmb_drv.c
+++ b/drivers/gpu/drm/kmb/kmb_drv.c

@@ -137,6 +137,7 @@ static int kmb_hw_init(struct drm_device *drm,

unsigned long flags)
 	/* Allocate LCD interrupt resources */
 	irq_lcd = platform_get_irq(pdev, 0);
 	if (irq_lcd < 0) {
+		ret = irq_lcd;
 		drm_err(&kmb->drm, "irq_lcd not found");
 		goto setup_fail;
 	}
--
2.30.2