From: Greg Kroah-Hartman Date: Wed, 6 Jan 2021 18:17:05 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.4.250~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c264e00c02c6cab93a6f4965e7f1f156fa1eb331;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch alsa-hda-realtek-modify-dell-platform-name.patch --- diff --git a/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch b/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch new file mode 100644 index 00000000000..4458bb7cb27 --- /dev/null +++ b/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch @@ -0,0 +1,37 @@ +From 3d5c5fdcee0f9a94deb0472e594706018b00aa31 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 1 Jan 2021 09:38:52 +0100 +Subject: ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable() + +From: Takashi Iwai + +commit 3d5c5fdcee0f9a94deb0472e594706018b00aa31 upstream. + +The silent_stream_disable() function introduced by the commit +b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to +DP") takes the per_pin->lock mutex, but it unlocks the wrong one, +spec->pcm_lock, which causes a deadlock. This patch corrects it. + +Fixes: b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to DP") +Reported-by: Jan Alexander Steffens (heftig) +Cc: +Acked-by: Kai Vehmanen +Link: https://lore.kernel.org/r/20210101083852.12094-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_hdmi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -1736,7 +1736,7 @@ static void silent_stream_disable(struct + per_pin->silent_stream = false; + + unlock_out: +- mutex_unlock(&spec->pcm_lock); ++ mutex_unlock(&per_pin->lock); + } + + /* update ELD and jack state via audio component */ diff --git a/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch b/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch new file mode 100644 index 00000000000..f095fc524a7 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch @@ -0,0 +1,34 @@ +From c1e8952395c1f44a6304c71401519d19ed2ac56a Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Wed, 23 Dec 2020 15:34:57 +0800 +Subject: ALSA: hda/realtek - Modify Dell platform name + +From: Kailang Yang + +commit c1e8952395c1f44a6304c71401519d19ed2ac56a upstream. + +Dell platform SSID:0x0a58 change platform name. +Use the generic name instead for avoiding confusion. + +Fixes: 150927c3674d ("ALSA: hda/realtek - Supported Dell fixed type headset") +Signed-off-by: Kailang Yang +Cc: +Link: https://lore.kernel.org/r/efe7c196158241aa817229df7835d645@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7885,7 +7885,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC), +- SND_PCI_QUIRK(0x1028, 0x0a58, "Dell Precision 3650 Tower", ALC255_FIXUP_DELL_HEADSET_MIC), ++ SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), diff --git a/queue-5.10/series b/queue-5.10/series index 8459818d8bd..e4845539744 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -5,3 +5,5 @@ rtc-pcf2127-only-use-watchdog-when-explicitly-available.patch dt-bindings-rtc-add-reset-source-property.patch kdev_t-always-inline-major-minor-helper-functions.patch bluetooth-fix-attempting-to-set-rpa-timeout-when-unsupported.patch +alsa-hda-realtek-modify-dell-platform-name.patch +alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch