From 836a0bb73c1719649f03e18670bc625303f0f38f Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 3 Sep 2026 12:38:40 +0300 Subject: [PATCH] ASoC: ti: omap-hdmi: Fix build error from a merge commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'ad->card' was removed in commit 9af2c1d4f847 ("ASoC: ti: omap-hdmi: remove unused *card"), but commit 699e5975e2a5 ("drm/omap: Report HDMI hotplug events to the ASoC HDMI codec") moved that code line. These commits were applied to different trees, and the merge was not quite right: assignment to 'ad->card' from the latter commit was left in the file, causing: sound/soc/ti/omap-hdmi.c:408:11: error: ‘struct hdmi_audio_data’ has no member named ‘card’ Fix the issue by removing the line. Reported-by: Mark Brown Closes: https://lore.kernel.org/all/apbbvQSfUbzYRFaw@sirena.org.uk/ Fixes: 1ae7fe832c2d ("Merge drm/drm-next into drm-misc-next") Reviewed-by: Ivaylo Dimitrov Link: https://patch.msgid.link/20260903-omap-hdmi-fix-v1-1-b0447a1d35d5@ideasonboard.com Signed-off-by: Tomi Valkeinen --- sound/soc/ti/omap-hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/ti/omap-hdmi.c b/sound/soc/ti/omap-hdmi.c index c32ec7c0b0cf..2cabd4cc5b0b 100644 --- a/sound/soc/ti/omap-hdmi.c +++ b/sound/soc/ti/omap-hdmi.c @@ -405,7 +405,6 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) card->dev = dev; atomic_set(&ad->jack_state, -1); - ad->card = card; snd_soc_card_set_drvdata(card, ad); ret = devm_snd_soc_register_card(dev, card);