From patchwork Fri Sep 6 19:47:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 13794716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC8BCE6FE46 for ; Fri, 6 Sep 2024 19:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=+Da3YG45hYBpjGQbOAK9bnsoiqlIfkN8ZztMmx3F5yk=; b=SYAboXX1XA7uM7AfwKg8uvdBfo 5WCpC8ac4jLiF99SXXAhkUOW/YquiNmqyl2ObaxP4id/J/3U/Gaa7L78feMm4rdjG6QO8zVkhPuxP x1VqTzHgmG4vFemuFuSk1jLb+kKh9MpvALjEORhLAqxIC6ra0DwC8r8kIoASr5D5S4boeN8HyO4kd 56ntQjIN3UGKqUTEyUgSiHddnODyMLJEwsMEheAiOtVrKflGknTUwoHHKm/OKYVMq482iyGp0qEm0 AEMCuHd0jUpyli65mGNIis7+HPrpVEVrxIH7727II6mXrkecj2MgmnaCxTqZUhRPzDVaHUSalxuJb h4vsC7kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smewZ-0000000DT5T-2l6E; Fri, 06 Sep 2024 19:48:31 +0000 Received: from smtp-80.smtpout.orange.fr ([80.12.242.80] helo=msa.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smevX-0000000DSrF-3GsA for linux-arm-kernel@lists.infradead.org; Fri, 06 Sep 2024 19:47:30 +0000 Received: from fedora.home ([90.11.132.44]) by smtp.orange.fr with ESMTPA id mevBsT9PpGrBemevBsXT6K; Fri, 06 Sep 2024 21:47:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1725652040; bh=+Da3YG45hYBpjGQbOAK9bnsoiqlIfkN8ZztMmx3F5yk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=E4G3y5qPUbQ0ybAxno9HO49+HCCyR9DDuZR0Q2jV3MWK6exeZ5zoDY7lr0x/UALpT y+vBnTduSgfIhWgYOkzU8ApCFhnR5DZ7iL6jE55pF1x+men2aiCGUnhWJQ0oX8Tgng 4q8/TTMBhUj6AsXln/f9GvBsHjaFBLixe+aYDmI/bg/I7WXzvsAPY0fF+BDkh372J0 2Eb0KTU8BCVSmRqDst2CYj2b2aNUQ5YWVjcKIRY4XRF2coIKRDGKFQcYE/FQtfMxsW zxXQa0kcUtlEbau6xQDhxqnJis3aLD2sLQDC/jl+plgWAPJhWjNhQB7vBlPECayMKM QVWA17oN+hx1g== X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 06 Sep 2024 21:47:20 +0200 X-ME-IP: 90.11.132.44 From: Christophe JAILLET To: Philipp Zabel , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Jani Nikula Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , Simona Vetter , dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH] drm/ipuv3/parallel: Fix an error handling path in imx_pd_probe() Date: Fri, 6 Sep 2024 21:47:00 +0200 Message-ID: <1cdd8523443d8850c5531462b30064cb2058924a.1725651992.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240906_124727_959062_A499BC70 X-CRM114-Status: GOOD ( 11.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If component_add() fails, we need to undo a potential previous drm_edid_alloc() call. Add an error handling path and the missing drm_edid_free(), as already done in the reomve function. Fixes: 42e08287a318 ("drm/ipuv3/parallel: convert to struct drm_edid") Signed-off-by: Christophe JAILLET --- drivers/gpu/drm/imx/ipuv3/parallel-display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c index 91d7808a2d8d..6d51203f7f0f 100644 --- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c +++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c @@ -350,7 +350,15 @@ static int imx_pd_probe(struct platform_device *pdev) platform_set_drvdata(pdev, imxpd); - return component_add(dev, &imx_pd_ops); + ret = component_add(dev, &imx_pd_ops); + if (ret) + goto free_edid; + + return 0; + +free_edid: + drm_edid_free(imxpd->drm_edid); + return ret; } static void imx_pd_remove(struct platform_device *pdev)