On 3.09.26 г. 12:38 ч., Tomi Valkeinen wrote:
'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 <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Fixes: 1ae7fe832c2d ("Merge drm/drm-next into drm-misc-next")
Signed-off-by: Tomi Valkeinen <[email protected]>
Reviewed-by: Ivaylo Dimitrov <[email protected]>
---
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);
---
base-commit: 97c594f71fa71dc30a0583a76d8b6ef5c5ea10b1
change-id: 20260903-omap-hdmi-fix-7f085e21b708
Best regards,
--
Tomi Valkeinen <[email protected]>
