diff options
| author | Hui Wang <hui.wang@canonical.com> | 2016-11-10 13:20:05 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:54:31 +0000 |
| commit | cdcd7162f822a7629a79e11c8490fbeb322bd30e (patch) | |
| tree | 3fb16f6a0a51dd4db12f9f78de06204839d21f13 /sound | |
| parent | f60c9f651a505df9d132e2ac61af229506eac2d5 (diff) | |
| download | linux-stable-cdcd7162f822a7629a79e11c8490fbeb322bd30e.tar.gz linux-stable-cdcd7162f822a7629a79e11c8490fbeb322bd30e.tar.bz2 linux-stable-cdcd7162f822a7629a79e11c8490fbeb322bd30e.zip | |
ALSA: hda - add a new condition to check if it is thinkpad
commit 2ecb704a1290edb5e3d53a75529192e7ed2a1a28 upstream.
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.
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.16: use acpi_get_devices() instead of acpi_dev_found()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/thinkpad_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 6ba0b5517c40..f233e90fa614 100644 --- a/sound/pci/hda/thinkpad_helper.c +++ b/sound/pci/hda/thinkpad_helper.c @@ -26,6 +26,9 @@ static bool is_thinkpad(struct hda_codec *codec) if (ACPI_SUCCESS(acpi_get_devices("LEN0068", acpi_check_cb, &found, NULL)) && found) return true; found = false; + if (ACPI_SUCCESS(acpi_get_devices("LEN0268", acpi_check_cb, &found, NULL)) && found) + return true; + found = false; return ACPI_SUCCESS(acpi_get_devices("IBM0068", acpi_check_cb, &found, NULL)) && found; } |