From: Hui Wang Date: Thu, 10 Nov 2016 05:20:05 +0000 (+0800) Subject: ALSA: hda - add a new condition to check if it is thinkpad X-Git-Tag: v3.16.40~88 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdcd7162f822a7629a79e11c8490fbeb322bd30e;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Takashi Iwai [bwh: Backported to 3.16: use acpi_get_devices() instead of acpi_dev_found()] Signed-off-by: Ben Hutchings --- diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 6ba0b5517c407..f233e90fa614f 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; }