From nobody Thu Dec 18 20:41:36 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 17F7922DFBA; Mon, 13 Jan 2025 14:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779978; cv=none; b=jfMFbqOsgIjn39uCWFlG/Qm4uBxCjDz3CIzLJ/WQfxm3hXeXmGRjuK3IaNPtdOtGYQb9UB0uDggQD13uOxSebWASyomKZlTol4Q5zUZtNSlotJ8Ed9IoM0L+XMhrppjAJRZZbvW7RihrXaCSduMxiC1tVcDa9Gbn6T/d2CX4DwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779978; c=relaxed/simple; bh=phEH9pFKI9VDxFx796nN2CBtMXeARDG4yPa1NPxZevo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BDgoo8c+UpUHvaO6463x882BB9HwbMLnVHbEVFH3gQ9zUe/gAWR2ELimHmgbccnHa6I8YBf966+kGmTQyrbIxNxJBrx5sOLvkSh5rlNymOrIs6/YmJSWh+2m/F8xgxHoeZ2TkrOcxt49q8c4LrHSJMmCueh0jfWlPF1Hc4yqQvg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=nkX6c/T2; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="nkX6c/T2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1736779975; bh=phEH9pFKI9VDxFx796nN2CBtMXeARDG4yPa1NPxZevo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nkX6c/T2tuZCsTsKEHaeAEv2gtQD3JdV7mOUT4BjIQgdwFkEey9kcxXr610YM40Ly xtkoL3q79MD5CpINw6igxQY0NQ8VndVXBnn2CMWR9knuHi7vb3AvmzBtaNRTMPKLrp Ji6trQbVdWew7Ppn0o50alQ666IDx3Z7sEQiL7Da8RSk7gcmYTwkaQroI2vHPYDKNI IY+T0YnWnZ6H+DKihaWEJ7klgLljmKSurKugihdYVhBaehfajbU/bmm8gH+FGNrXYH bfDvj2UJYmXLUJjij04UTc5vgbHCvYve4nGVB8IaxvsU3677ajNOh046w8lS8jOhrD wVevvrABXJhig== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 09D1617E0D9D; Mon, 13 Jan 2025 15:52:53 +0100 (CET) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, ck.hu@mediatek.com, jitao.shi@mediatek.com, jie.qiu@mediatek.com, junzhi.zhao@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, dmitry.baryshkov@linaro.org, lewis.liao@mediatek.com, ives.chenjh@mediatek.com, tommyyl.chen@mediatek.com, jason-jh.lin@mediatek.com Subject: [PATCH v5 12/34] drm/mediatek: mtk_hdmi: Unregister audio platform device on failure Date: Mon, 13 Jan 2025 15:52:10 +0100 Message-ID: <20250113145232.227674-13-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> References: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> 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" The probe function of this driver may fail after registering the audio platform device: in that case, the state is not getting cleaned up, leaving this device registered. Adding up to the mix, should the probe function of this driver return a probe deferral for N times, we're registering up to N audio platform devices and, again, never freeing them up. To fix this, add a pointer to the audio platform device in the mtk_hdmi structure, and add a devm action to unregister it upon driver removal or probe failure. Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support") Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index a5471abf16dd..a9cdeede499f 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -172,6 +172,7 @@ struct mtk_hdmi { unsigned int sys_offset; void __iomem *regs; enum hdmi_colorspace csp; + struct platform_device *audio_pdev; struct hdmi_audio_param aud_param; bool audio_enable; bool powered; @@ -1661,6 +1662,11 @@ static const struct hdmi_codec_ops mtk_hdmi_audio_co= dec_ops =3D { .hook_plugged_cb =3D mtk_hdmi_audio_hook_plugged_cb, }; =20 +static void mtk_hdmi_unregister_audio_driver(void *data) +{ + platform_device_unregister(data); +} + static int mtk_hdmi_register_audio_driver(struct device *dev) { struct mtk_hdmi *hdmi =3D dev_get_drvdata(dev); @@ -1671,13 +1677,20 @@ static int mtk_hdmi_register_audio_driver(struct de= vice *dev) .data =3D hdmi, .no_capture_mute =3D 1, }; - struct platform_device *pdev; + int ret; =20 - pdev =3D platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, - PLATFORM_DEVID_AUTO, &codec_data, - sizeof(codec_data)); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); + hdmi->audio_pdev =3D platform_device_register_data(dev, + HDMI_CODEC_DRV_NAME, + PLATFORM_DEVID_AUTO, + &codec_data, + sizeof(codec_data)); + if (IS_ERR(hdmi->audio_pdev)) + return PTR_ERR(hdmi->audio_pdev); + + ret =3D devm_add_action_or_reset(dev, mtk_hdmi_unregister_audio_driver, + hdmi->audio_pdev); + if (ret) + return ret; =20 DRM_INFO("%s driver bound to HDMI\n", HDMI_CODEC_DRV_NAME); return 0; --=20 2.47.0