]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:30 +0000 (10:49 +0200)
commit65b1fd4153669af0a3ebf3bb5923034e5944fedb
treeaa2220b426959beaaa2fea79603bd5de32efec07
parent7c6883a9241e0160d09c898cabd2de9333b3b31b
ALSA: hda/realtek: ALC285 Thinkpad jack pin quirk is unreachable

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>
sound/pci/hda/patch_realtek.c