]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
ALSA: hda/realtek: ALC285 Thinkpad jack pin quirk is unreachable
authorSami Loone <sami@loone.fi>
Sat, 1 May 2021 10:07:53 +0000 (12:07 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 26 May 2021 13:39:07 +0000 (15:39 +0200)
commit26c6fd65fc94fe9a81e2434b4fe9382351bae3da
treecb2522c05c8ff4b0e73580d40814915e8c5cca8a
parent59404c3469e490fad2c3bc00c762bd86e9f17a33
ALSA: hda/realtek: ALC285 Thinkpad jack pin quirk is unreachable

BugLink: https://bugs.launchpad.net/bugs/1929615
commit 266fd994b2b0ab7ba3e5541868838ce30775964b upstream.

In 9bbb94e57df1 ("ALSA: hda/realtek: fix static noise on ALC285 Lenovo
laptops") an existing Lenovo quirk was made more generic by removing a
0x12 pin requirement from the entry. This made the second chance table
Thinkpad jack entry unreachable as the pin configurations became
identical.

Revert the 0x12 pin requirement removal and move Thinkpad jack pin quirk
back to the primary pin table as they can co-exist when more specific
configurations come first.

Add a more targeted pin quirk for Lenovo devices that have 0x12 as
0x40000000.

Tested on Yoga 6 (AMD) laptop.

[ Corrected the commit ID -- tiwai ]

Fixes: 9bbb94e57df1 ("ALSA: hda/realtek: fix static noise on ALC285 Lenovo laptops")
Signed-off-by: Sami Loone <sami@loone.fi>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/YI0oefvTYn8URYDb@yoga
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
sound/pci/hda/patch_realtek.c