Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <f6c4e3213bf102d0986bd90f41d61d2a7df8d495.camel@nxp.com>
Subject: Re: [PATCH] drm/imx: dw_hdmi-imx: Fix bailout in error cases of
 probe
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>
Date:   Fri, 25 Feb 2022 11:06:21 +0800
In-Reply-To: <20220128091944.3831256-1-victor.liu@nxp.com>
References: <20220128091944.3831256-1-victor.liu@nxp.com>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.4-0ubuntu1 
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RFg0ejhhK0c4bUloc2R2L3FzRVB4MFNmUzhCYWZCSmJNVjg1NkV4c2FmV3h3?=
 =?utf-8?B?ZllqR25EQllQNUtZN094U01ZOG5xWXh0MmhMMThVaUFZTi93b3Awbmc5NkZ2?=
 =?utf-8?B?TS9VcGM0WlB1M0NkbXJ6cHVIaGM0bzMzMkc2STRjSGplWnZSc2kvTFZaemhE?=
 =?utf-8?B?SFJ5VVhsYUpEOG9ZSGFSNTJhRFV4cGUwWVFuZERLb3pvamt2enI5aU1SeDNm?=
 =?utf-8?B?bGk3MDZrclVRL0ZWRGxIS0dvMERqTE5wT3g4b2RCdTA1QlhnQlA0dTZ1ZXZZ?=
 =?utf-8?B?cmRqd1VhaTR6eTB0MTBnZklKcnFYUk1wbnlsaEMvaGZaa1BINERBVDNPNHFV?=
 =?utf-8?B?eVkzaWUxS09DbHhnbzdPUDBXMXMrVzB4M0pvUmszcWxhaDJOMU5kUWNxVHps?=
 =?utf-8?B?UVVaZGFNSUU3THNGMW16dVNHMnIrREE1T1JjclBFTjVGRzdjZStNVzdqZXhp?=
 =?utf-8?B?bEN6cEw4RWlpMzViMXRXZlhGdy9JNzVpQnpKZXZEbnpKMFVxalNXTGNtNWdW?=
 =?utf-8?B?dUlQaEFOQk9VYjRpbG5qMUNKNjZaeDRDUUJ1U2lJeisxWWxiSTFKM3FaWHh6?=
 =?utf-8?B?eDJweFVhTHNqY3ZlVS9mVHN0U2FtRm8wbzVOWnE3YVFwUUNVMXBnRldzaGtk?=
 =?utf-8?B?NUZDS3dLN0o1MWs1eitMVnM2Um1ubXJ4L0lnVURCbFB6RDIxazc2enQ3YTR0?=
 =?utf-8?B?UGNpY2xCeC9GNGdQMEtYcWpXeGVzRUZBdnRLN1gzTSs2OWV4MUplTGlRWjVC?=
 =?utf-8?B?QUpEYU1GN0VNUEw3anV3UWNaYnY4NFBmcSsyREMwckVoNlJWS1d5UzR4VnIr?=
 =?utf-8?B?dTlPQzNkNnd0ZzBra1IvMjJTUGdRdVNXUWtSY2tXWUNyZld4WEFiSnlqVzZT?=
 =?utf-8?B?VXJGbkI0VC82SHAySDNJRnRZZ25ZVnNQbFVmOGIxQWU0STlSVGE4aHlCTXNo?=
 =?utf-8?B?SW1LYndKbkdVaDdxR1N0YjcxRlhoUk5WVzc0T2YyR0VhV2w3dGc4RUVVSTdP?=
 =?utf-8?B?MUNSWXlpSk1xWDlhUEdqSlRWUVBiK2pjSWhnU3puMFBVL1YxamZSb2ZYZjNa?=
 =?utf-8?B?eGpkU0xTM2h6SzFGVW1TUGVodzZyU016QU0wVUpkaTFmQUpPcmlBcHl2ZnMx?=
 =?utf-8?B?eEJ2dG9JYTJOT1lTNnJCZWo4WXZXclUzbVFnZzJuRmNjbFZsSXhZNlpRbSs0?=
 =?utf-8?B?aXVSNkg2N0QrRjk4Z3F3N3VFVnZYeWZKRUtaN2phdkJPWlJYL0w0SXBEaXY0?=
 =?utf-8?B?UFhTQlF6dXlyK3lYYkF5K290dXNuejQ1dTRGanBMT21PUEtzMUEyWW5wR3dY?=
 =?utf-8?B?UHRhOThETWVjc1phci9TUE9HZ0UxaTRhNGdtbnR5d1VHWmJ2OUs5TkJ6OFk2?=
 =?utf-8?B?Tk5pRmNIbyswTTI4U0NrRXVjaWZsNzV1Sm1KcW4vQWNoWU01TTV6MitSamt3?=
 =?utf-8?B?T0VIVnR3YWJzd3lxdzQ3TTNzbnlrZXNTU0R0eWVDeUtPamRaenNIRWlOVHBJ?=
 =?utf-8?B?UkQwRTJyKzU5c0tOaEVzc1BrV0R3MVVEQ1hycnl1bmF3T3Z1N2FhVXYyTXR2?=
 =?utf-8?B?TS8ya3E0NzVwZlZvRXdlOHJJeXB0UkZtKzlHK2JEakVKT3RGdzlZTWhyaXh5?=
 =?utf-8?B?WDQvUFlWSGN2T2l2cTlUOXpuQjgrVzJBNldNZGoxaHdSQ1hZRHE3RXl5eFps?=
 =?utf-8?B?N0w4c3l2MUVFRHpta1JCeFBqSEJQdy9pWXRFSXJmUG83aTRHT2l1OE1PbHI3?=
 =?utf-8?B?OTQ4Z0VITjhWYUlFeHd4ZzB2TXNyVEVDR2IzNEFvME1NSjE3YU5IRm83NFBr?=
 =?utf-8?B?SGMwY2FkVGFhYVRYL2RTelRlNWYxTG1BWEYrVXBDOWRnZ3NaRkgxeGxWNE04?=
 =?utf-8?B?SzZraEtmc3ppa3pkdGJXNlE0SWs5REl6UTNUZHdQeUQrT1dXNGx1UzFaTDJW?=
 =?utf-8?B?VVFycWd5Vjdsa2UrMG1od1o0NzliZWJaZGx3VmJ1bWxDMFN6cnU2cHpHT0cz?=
 =?utf-8?B?bTU3eFMxbjZQZm0yeUxudVBFSFJ3Tk9DdDU1eUpiVnhPYU5peHkyYzhXdFlY?=
 =?utf-8?B?TkFlay9KaVpEYjdBa2dUbmgvLzBVUlJoY1p6UVJqNk94N2szSkJSMnhZWGpE?=
 =?utf-8?B?d0k2RVlHQTJsNEpVUWNpR0ZpSkp3WFhCclp6L0lGRGxGT0lVeENzVndkWno2?=
 =?utf-8?Q?2g6HY9Z2/fklZO5QF7FTCko=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0d007ef8-5342-4d9a-477c-08d9f80bcb8a
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2022 03:06:19.5926
 (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: tqdlJoSwG9DsKJmT9aTZq53y/BAaudSDEIOdbmaNZYfF4TiBN02tC3ZrWbttVbnYysqTiwfmuLJUptSh62AK0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4710
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Philipp,

On Fri, 2022-01-28 at 17:19 +0800, Liu Ying wrote:
> 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>

Any comments?  Can you please pick this up?

Regards,
Liu Ying

> ---
>  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)