diff mbox series

[SRU,F/E/OEM-B-OSP1/B/OEM-B,1/1] UBUNTU: SAUCE: ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1

Message ID 20200225010210.7227-2-hui.wang@canonical.com
State Accepted
Headers show
Series alsa/hda/realtek: fix a mute led regression on Lenovo X1 Carbon | expand

Commit Message

Hui Wang Feb. 25, 2020, 1:02 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1864576

Need to chain the THINKPAD_ACPI, otherwise the mute led will not
work.

Fixes: d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
(cherry picked from commit df80fe19fb7e404208b897ec7b067e21abe75fb2
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Po-Hsu Lin Feb. 25, 2020, 1:42 a.m. UTC | #1
Hello,
the commit SHA1 looks like it should be
c37c0ab029569a75fd180edb03d411e7a28a936f instead?
https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=c37c0ab029569a75fd180edb03d411e7a28a936f

On Tue, Feb 25, 2020 at 9:28 AM Hui Wang <hui.wang@canonical.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/1864576
>
> Need to chain the THINKPAD_ACPI, otherwise the mute led will not
> work.
>
> Fixes: d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hui Wang <hui.wang@canonical.com>
> (cherry picked from commit df80fe19fb7e404208b897ec7b067e21abe75fb2
> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git)
> Signed-off-by: Hui Wang <hui.wang@canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index bb3a4d5b37d7..bf8f0eb44772 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -6674,6 +6674,8 @@ static const struct hda_fixup alc269_fixups[] = {
>         [ALC285_FIXUP_SPEAKER2_TO_DAC1] = {
>                 .type = HDA_FIXUP_FUNC,
>                 .v.func = alc285_fixup_speaker2_to_dac1,
> +               .chained = true,
> +               .chain_id = ALC269_FIXUP_THINKPAD_ACPI
>         },
>         [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
>                 .type = HDA_FIXUP_PINS,
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Hui Wang Feb. 25, 2020, 2:22 a.m. UTC | #2
Oh, right,  forgot to reset --hard before git pull.

will resend the updated patch.

Thanks,

Hui.

On 2020/2/25 上午9:42, Po-Hsu Lin wrote:
> Hello,
> the commit SHA1 looks like it should be
> c37c0ab029569a75fd180edb03d411e7a28a936f instead?
> https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=c37c0ab029569a75fd180edb03d411e7a28a936f
>
> On Tue, Feb 25, 2020 at 9:28 AM Hui Wang <hui.wang@canonical.com> wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1864576
>>
>> Need to chain the THINKPAD_ACPI, otherwise the mute led will not
>> work.
>>
>> Fixes: d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen")
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Hui Wang <hui.wang@canonical.com>
>> (cherry picked from commit df80fe19fb7e404208b897ec7b067e21abe75fb2
>> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git)
>> Signed-off-by: Hui Wang <hui.wang@canonical.com>
>> ---
>>   sound/pci/hda/patch_realtek.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
>> index bb3a4d5b37d7..bf8f0eb44772 100644
>> --- a/sound/pci/hda/patch_realtek.c
>> +++ b/sound/pci/hda/patch_realtek.c
>> @@ -6674,6 +6674,8 @@ static const struct hda_fixup alc269_fixups[] = {
>>          [ALC285_FIXUP_SPEAKER2_TO_DAC1] = {
>>                  .type = HDA_FIXUP_FUNC,
>>                  .v.func = alc285_fixup_speaker2_to_dac1,
>> +               .chained = true,
>> +               .chain_id = ALC269_FIXUP_THINKPAD_ACPI
>>          },
>>          [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
>>                  .type = HDA_FIXUP_PINS,
>> --
>> 2.17.1
>>
>>
>> --
>> kernel-team mailing list
>> kernel-team@lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index bb3a4d5b37d7..bf8f0eb44772 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6674,6 +6674,8 @@  static const struct hda_fixup alc269_fixups[] = {
 	[ALC285_FIXUP_SPEAKER2_TO_DAC1] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc285_fixup_speaker2_to_dac1,
+		.chained = true,
+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI
 	},
 	[ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
 		.type = HDA_FIXUP_PINS,