| Message ID | 1478755205-21615-1-git-send-email-hui.wang@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 10 Nov 2016 06:20:05 +0100, Hui Wang wrote: > > 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> > --- > And the fix for thinkpad_acpi.c already sent out, and got ACK, > please refer to: > https://sourceforge.net/p/ibm-acpi/mailman/message/35478616/ > > Acctually we don't need to wait thinkpad_acpi.c to be patched first, > since no matter the thinkpad_acpi.c merge that patch or not, the led > control function is always provided by thinkpad_acpi.c, the new > HKEY_ID only affects the automatic insmod for thinkpad_acpi.ko. Thanks, applied now. Takashi > > sound/pci/hda/thinkpad_helper.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c > index 6a23302..4d9d320 100644 > --- a/sound/pci/hda/thinkpad_helper.c > +++ b/sound/pci/hda/thinkpad_helper.c > @@ -13,7 +13,8 @@ > 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) > -- > 1.9.1 >
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 6a23302..4d9d320 100644 --- a/sound/pci/hda/thinkpad_helper.c +++ b/sound/pci/hda/thinkpad_helper.c @@ -13,7 +13,8 @@ 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)
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> --- And the fix for thinkpad_acpi.c already sent out, and got ACK, please refer to: https://sourceforge.net/p/ibm-acpi/mailman/message/35478616/ Acctually we don't need to wait thinkpad_acpi.c to be patched first, since no matter the thinkpad_acpi.c merge that patch or not, the led control function is always provided by thinkpad_acpi.c, the new HKEY_ID only affects the automatic insmod for thinkpad_acpi.ko. sound/pci/hda/thinkpad_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)