Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Liu Ying <victor.liu@nxp.com>
To:     dri-devel@lists.freedesktop.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     Philipp Zabel <p.zabel@pengutronix.de>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>
Subject: [PATCH] drm/imx: dw_hdmi-imx: Fix bailout in error cases of probe
Date:   Fri, 28 Jan 2022 17:19:44 +0800
Message-Id: <20220128091944.3831256-1-victor.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZVy8xEYmJjXhOLblxWeiQG5xYofmobm3v6gYuntFHpkLSuUuFE5Uj4JOmveJ?=
 =?us-ascii?Q?P1igpBYfepb7AlQfml2Ul90yitbGDtmotYbyv7kxK9swjryI2tBiMa6jSOZ9?=
 =?us-ascii?Q?cSoFFA306al9Fid0uJLCSByv9Vq1K2EuS5AZm7huu7A8+fLmjzMtJ/SNWtER?=
 =?us-ascii?Q?o5nnLBIN7foVVuyqfIGLl6+4tKMYdapjx5P5iPU3TtpT/uUCvaKxi56oumxJ?=
 =?us-ascii?Q?7q3in2ED87cdKDZm5imZbBrohuq8VTfZ0cWoQmhN579SJkQFYJo29QoAyHvU?=
 =?us-ascii?Q?64UhEZrDu3gfqTON8+VsWf7dGgsQCUGHQQMYxkDkfSCLGGMydquZbuJ98Da4?=
 =?us-ascii?Q?9FTN32C1Uf+o9ZKF5lVr0kPoirLcNM4VNDWT6XpI1Xis7KZtnOTBGEVcU+Dg?=
 =?us-ascii?Q?I7wEIH0oYaoO7dq9LJTOWjtAgqAfnu8+vaRgCtVPTMGYMjARHr6rsXHicDhZ?=
 =?us-ascii?Q?ngum6ZYqrdtGNFRnFYftfAR5w+ffk901myzuEew2vvmz28HsVOgjP5PcM48E?=
 =?us-ascii?Q?WFNBh5tksCnAd5GwBUe8Q6zj3YdU9bqTKBtxDmSWb04zQhwdXr+acb9BPfNV?=
 =?us-ascii?Q?qBi9Wsz3BVm9G/cafQLCxYLbKlYsogV+26fPVRiMfRceDrpMG5drSkkAZsla?=
 =?us-ascii?Q?uMoRaWPKG4P7MhjDp2Xtix9Yf4yDKvHKjjaZ8wxxexuUu829ZmX/POR6DlmY?=
 =?us-ascii?Q?VuSdCs8HcuGpj4ovEjqi3kJndVo5VXKo5ckV0IFria4y2Uq3Xpt1K25hA0Bw?=
 =?us-ascii?Q?HOP3ipQAeth3nx8AXkjCTUQQxhLz2PtFAWSNf/xyHsGex5o7G4PbnWV1MivV?=
 =?us-ascii?Q?gHwJJTw4LD0tZ5+9wpcMCboG+Ziqw7ddLCgBdvWhSt9WS1YAuS0vXZ41KRTX?=
 =?us-ascii?Q?NFluKetAp2JcVHEDbo1Vlylaaf2e7d0KYiicE1l5w11E6bOzR1FeLNjK0ro4?=
 =?us-ascii?Q?aLtXjijY470LMsobqnrHxCAX6iyFNhcE1x6nsUGdlWCEiV4c+HIf92E4RmcV?=
 =?us-ascii?Q?G2NgsjyVImemV1wn5upqiQe7oZT8RgDCbbVf/R7AUNo/cxCC4Z2zG0We9g23?=
 =?us-ascii?Q?uCykmG4cTMUAv6XmDoEz/al8B7H0Jy6i7yGv4mEqQWmphH8DYff3eE9zT96a?=
 =?us-ascii?Q?vLtyUpTUGeSQMYGZ3LjiLvFIB3qTUEkUdtYLyfpJGBpkSV9aKPd3ked3pdug?=
 =?us-ascii?Q?h/oBLXXMePxkg0lwNA/bL9Cdws8XhEi14ImTEjV5NHp9wa/1ic1/U2AcSsro?=
 =?us-ascii?Q?zzcj2g9D1VsPQBRC0E03bjQJqW6wQ677awnquhJsINlbEL6s3YV6hBQN5HrU?=
 =?us-ascii?Q?4AOD0tWfMST+DVgNmbrFlfRAgiEUFY1XnW6E9H1VfStaS1oy2XAbD39i7fpM?=
 =?us-ascii?Q?oCsIpVCZtQAug3g72tIFAIU5bmMhJWbcKd8a2hOWgsvdyb93ttcz5fzgvbum?=
 =?us-ascii?Q?pKxdvyziPKEe5zQzyZzGCoHpb24bYUAxiC1eP8IZb4MH2phfNuUzvDwC2Dui?=
 =?us-ascii?Q?RVoov8GTRmXJaobeyyqc+rgx27j0EAaBlOYQj4ADYBP91tiC3u2LQBLtSghF?=
 =?us-ascii?Q?WeYUd9wVaXlTkHWcG6tc+u2ySfp0owVBGAK1m8SyyisroVczcJwxOR3CnQ9C?=
 =?us-ascii?Q?o1pELza6S2nG04Ic9Wd+47A=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d320aac7-ea70-4de8-eedb-08d9e23f7757
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2022 09:20:46.5984
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1jX64J35mum6XezSRBlo5DSD6HP4tCT3Ty1jNrM4hffz97FGvRrlR+DuPhOBW53vGUWxa4WAOLPxJFOe94QK6Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6484
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In dw_hdmi_imx_probe(), if error happens after dw_hdmi_probe() returns
successfully, dw_hdmi_remove() should be called where necessary as
bailout.

Fixes: c805ec7eb210 ("drm/imx: dw_hdmi-imx: move initialization into probe")
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
 drivers/gpu/drm/imx/dw_hdmi-imx.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 87428fb23d9f..a2277a0d6d06 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -222,6 +222,7 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	const struct of_device_id *match = of_match_node(dw_hdmi_imx_dt_ids, np);
 	struct imx_hdmi *hdmi;
+	int ret;
 
 	hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
 	if (!hdmi)
@@ -243,10 +244,15 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev)
 	hdmi->bridge = of_drm_find_bridge(np);
 	if (!hdmi->bridge) {
 		dev_err(hdmi->dev, "Unable to find bridge\n");
+		dw_hdmi_remove(hdmi->hdmi);
 		return -ENODEV;
 	}
 
-	return component_add(&pdev->dev, &dw_hdmi_imx_ops);
+	ret = component_add(&pdev->dev, &dw_hdmi_imx_ops);
+	if (ret)
+		dw_hdmi_remove(hdmi->hdmi);
+
+	return ret;
 }
 
 static int dw_hdmi_imx_remove(struct platform_device *pdev)
-- 
2.25.1