diff options
author | Hui Wang <hui.wang@canonical.com> | 2016-11-10 00:20:05 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-11-10 03:32:55 -0500 |
commit | 2ecb704a1290edb5e3d53a75529192e7ed2a1a28 (patch) | |
tree | d625f60d9a25e38a7a3407ca585b9f9aa526834c | |
parent | 6809cd682b82dfff47943850d1a8c714f971b5ca (diff) |
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>
-rw-r--r-- | sound/pci/hda/thinkpad_helper.c | 3 |
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); | |||
13 | static bool is_thinkpad(struct hda_codec *codec) | 13 | static bool is_thinkpad(struct hda_codec *codec) |
14 | { | 14 | { |
15 | return (codec->core.subsystem_id >> 16 == 0x17aa) && | 15 | return (codec->core.subsystem_id >> 16 == 0x17aa) && |
16 | (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068")); | 16 | (acpi_dev_found("LEN0068") || acpi_dev_found("LEN0268") || |
17 | acpi_dev_found("IBM0068")); | ||
17 | } | 18 | } |
18 | 19 | ||
19 | static void update_tpacpi_mute_led(void *private_data, int enabled) | 20 | static void update_tpacpi_mute_led(void *private_data, int enabled) |