This is a note to let you know that I've just added the patch titled
ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From defce244b01ee12534910a4544e11be5eb927d25 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed, 28 Apr 2021 13:27:03 +0200
Subject: ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices
From: Takashi Iwai <tiwai@xxxxxxx>
commit defce244b01ee12534910a4544e11be5eb927d25 upstream.
The quirk entry for Uniwill ECS M31EI is with the PCI SSID device 0,
which means matching with all. That is, it's essentially equivalent
with SND_PCI_QUIRK_VENDOR(0x1584), which also matches with the
previous entry for Haier W18 applying the very same quirk.
Let's unify them with the single vendor-quirk entry.
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210428112704.23967-13-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/patch_realtek.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6569,8 +6569,7 @@ static const struct snd_pci_quirk alc861
SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", ALC861_FIXUP_ASUS_A6RP),
SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", ALC861_FIXUP_AMP_VREF_0F),
SND_PCI_QUIRK(0x1462, 0x7254, "HP DX2200", ALC861_FIXUP_NO_JACK_DETECT),
- SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", ALC861_FIXUP_AMP_VREF_0F),
- SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", ALC861_FIXUP_AMP_VREF_0F),
+ SND_PCI_QUIRK_VENDOR(0x1584, "Haier/Uniwill", ALC861_FIXUP_AMP_VREF_0F),
SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", ALC861_FIXUP_FSC_AMILO_PI1505),
{}
};
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-4.9/alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch
queue-4.9/alsa-emu8000-fix-a-use-after-free-in-snd_emu8000_create_mixer.patch
queue-4.9/alsa-hda-realtek-re-order-alc269-lenovo-quirk-table-entries.patch
queue-4.9/alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch
queue-4.9/alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch
queue-4.9/alsa-sb-fix-two-use-after-free-in-snd_sb_qsound_build.patch
queue-4.9/alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch
queue-4.9/alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch
