From nobody Thu Oct 2 03:30:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68824265CB2; Tue, 23 Sep 2025 15:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758641173; cv=none; b=opDzvmlcWpw6SvCs/QUP2ArbTjnDAgeOxheWBikd0MSQTyiwG0ELY58w/9+Zd2NATxHBPzeo3O7HW2ea5ljTtUO9/GZW7ujbClt6S9WMUyur2ORUrvFD/sitLMvM2+MkKDUKrj8AKZMNCKmMdZENZy+GV8Xn6mu2uPf3meQAfX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758641173; c=relaxed/simple; bh=30zvSnUQBdVP9nzTp9cWqSwZXrzYK9ux1hOlnELHiMU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BBLKxysYotqDBXIkpjGmRNJCIPFgSKLvGDiBIQtmu8DXihdHHiQWFwY5JwH3wYShqC20SW24QCeZeUPRrLxtVG5PtJ7JgMo7gCRjtGBEOCsWv114K4aoVNKRa4OvXO7nRLjN134aYWu+ktxPIy/xedlm51avT5psAKcxFDeSaY0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I7K7+f+R; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I7K7+f+R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 195F4C4CEF5; Tue, 23 Sep 2025 15:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758641173; bh=30zvSnUQBdVP9nzTp9cWqSwZXrzYK9ux1hOlnELHiMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I7K7+f+Rbm1S4nTXRHRqvh91O7U0m8/B6AUA+ntX4CdJJSk5ObmzTNWPnH6KZCOw4 UzbXvOlLO2uPG6LQtVr/w1RvH/W68P0jmfEFCjjo9cO9zhRC0xFAF+sKhbUSJXEsA2 LEgxPxLXpFmRZ8lyOvBOHLkrh5hN3zsSCR1YSz63lPQooVmakiahMDH1NWWoSmXL41 H8xEAZHP5ex9Ga9uVil+WgByS+giNxIllok+J7B5I14gJ0tr6mJn/he44FMoRWC+RU szrEWjCUnwhBCNLJgwXUSHlPiUZ4EtLNyjs2bqXjTkhFm8RJh6ZG7sXu4y8BfPiqqn 67i83Z4IhQvBQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v14u7-000000004mv-0ek6; Tue, 23 Sep 2025 17:26:07 +0200 From: Johan Hovold To: Chun-Kuang Hu , Philipp Zabel Cc: David Airlie , Simona Vetter , Matthias Brugger , AngeloGioacchino Del Regno , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Jie Qiu Subject: [PATCH 4/5] drm/mediatek: mtk_hdmi: fix probe device leaks Date: Tue, 23 Sep 2025 17:23:39 +0200 Message-ID: <20250923152340.18234-5-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250923152340.18234-1-johan@kernel.org> References: <20250923152340.18234-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the references to the DDC adapter and CEC device taken during probe on probe failure (e.g. probe deferral) and on driver unbind. Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support") Cc: stable@vger.kernel.org # 4.8 Cc: Jie Qiu Signed-off-by: Johan Hovold --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index b766dd5e6c8d..306e2c907311 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1345,6 +1345,13 @@ static const struct drm_bridge_funcs mtk_hdmi_bridge= _funcs =3D { .edid_read =3D mtk_hdmi_bridge_edid_read, }; =20 +static void mtk_hdmi_put_device(void *_dev) +{ + struct device *dev =3D _dev; + + put_device(dev); +} + static int mtk_hdmi_get_cec_dev(struct mtk_hdmi *hdmi, struct device *dev,= struct device_node *np) { struct platform_device *cec_pdev; @@ -1369,6 +1376,10 @@ static int mtk_hdmi_get_cec_dev(struct mtk_hdmi *hdm= i, struct device *dev, struc } of_node_put(cec_np); =20 + ret =3D devm_add_action_or_reset(dev, mtk_hdmi_put_device, &cec_pdev->dev= ); + if (ret) + return ret; + /* * The mediatek,syscon-hdmi property contains a phandle link to the * MMSYS_CONFIG device and the register offset of the HDMI_SYS_CFG @@ -1423,6 +1434,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *= hdmi, if (!hdmi->ddc_adpt) return dev_err_probe(dev, -EINVAL, "Failed to get ddc i2c adapter by nod= e\n"); =20 + ret =3D devm_add_action_or_reset(dev, mtk_hdmi_put_device, &hdmi->ddc_adp= t->dev); + if (ret) + return ret; + ret =3D mtk_hdmi_get_cec_dev(hdmi, dev, np); if (ret) return ret; --=20 2.49.1