| From defce244b01ee12534910a4544e11be5eb927d25 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| 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@suse.de> |
| |
| 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@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20210428112704.23967-13-tiwai@suse.de |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| 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 |
| @@ -9264,8 +9264,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), |
| {} |
| }; |
