aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch b/target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch
deleted file mode 100644
index fa4f93216c..0000000000
--- a/target/linux/brcm2708/patches-4.14/950-0202-drm-vc4-Fix-crash-if-we-have-to-unbind-HDMI.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1254dfa5b20336d10e9cf917cdf94c63b4cc44e1 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Mon, 13 Nov 2017 14:23:48 -0800
-Subject: [PATCH 202/454] drm/vc4: Fix crash if we have to unbind HDMI.
-
-We need the card to unregister before the codec that the card
-references.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1130,7 +1130,7 @@ static int vc4_hdmi_audio_init(struct vc
- * snd_soc_card_get_drvdata() if needed.
- */
- snd_soc_card_set_drvdata(card, hdmi);
-- ret = devm_snd_soc_register_card(dev, card);
-+ ret = snd_soc_register_card(card);
- if (ret) {
- dev_err(dev, "Could not register sound card: %d\n", ret);
- goto unregister_codec;
-@@ -1147,13 +1147,16 @@ unregister_codec:
- static void vc4_hdmi_audio_cleanup(struct vc4_hdmi *hdmi)
- {
- struct device *dev = &hdmi->pdev->dev;
-+ struct snd_soc_card *card = &hdmi->audio.card;
-
- /*
- * If drvdata is not set this means the audio card was not
- * registered, just skip codec unregistration in this case.
- */
-- if (dev_get_drvdata(dev))
-+ if (dev_get_drvdata(dev)) {
-+ snd_soc_unregister_card(card);
- snd_soc_unregister_codec(dev);
-+ }
- }
-
- #ifdef CONFIG_DRM_VC4_HDMI_CEC