summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorHui Wang <hui.wang@canonical.com>2016-11-10 13:20:05 +0800
committerTakashi Iwai <tiwai@suse.de>2016-11-10 09:32:55 +0100
commit2ecb704a1290edb5e3d53a75529192e7ed2a1a28 (patch)
treed625f60d9a25e38a7a3407ca585b9f9aa526834c /sound
parent6809cd682b82dfff47943850d1a8c714f971b5ca (diff)
downloadlinux-stable-2ecb704a1290edb5e3d53a75529192e7ed2a1a28.tar.gz
linux-stable-2ecb704a1290edb5e3d53a75529192e7ed2a1a28.tar.bz2
linux-stable-2ecb704a1290edb5e3d53a75529192e7ed2a1a28.zip
ALSA: hda - add a new condition to check if it is thinkpad
Latest Thinkpad laptops use the HKEY_HID LEN0268 instead of the LEN0068, as a result neither audio mute led nor mic mute led can work any more. After adding the new HKEY_HID into the is_thinkpad(), both of them works well as before. Cc: <stable@vger.kernel.org> Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/thinkpad_helper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index 6a23302297c9..4d9d320a7971 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -13,7 +13,8 @@ static void (*old_vmaster_hook)(void *, int);
static bool is_thinkpad(struct hda_codec *codec)
{
return (codec->core.subsystem_id >> 16 == 0x17aa) &&
- (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068"));
+ (acpi_dev_found("LEN0068") || acpi_dev_found("LEN0268") ||
+ acpi_dev_found("IBM0068"));
}
static void update_tpacpi_mute_led(void *private_data, int enabled)