[B/C/D/unstable,1/1] ALSA: hda/realtek - Fix the mute LED regresion on Lenovo X1 Carbon
diff mbox series

Message ID 20181214054144.10281-2-hui.wang@canonical.com
State New
Headers show
Series
  • [B/C/D/unstable,1/1] ALSA: hda/realtek - Fix the mute LED regresion on Lenovo X1 Carbon
Related show

Commit Message

Hui Wang Dec. 14, 2018, 5:41 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1808465

Users reported a mute LED regression on Lenovo X1 Carbon, the root
cause is we applied the fixup of ALC285_FIXUP_LENOVO_HEADPHONE_NOISE
to this machine, then the machine can't apply the fixup of
ALC269_FIXUP_THINKPAD_ACPI anymore. To fix it, we chain two fixup
together.

Fixes: c4cfcf6f4297 ("ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 6ba189c5c1a4bda70dc1e4826c58b0246068bb8d)
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 Dec. 17, 2018, 9:19 a.m. UTC | #1
Seems that this patch cannot be cherry-picked for Bionic / Cosmic.
Can you please check if this needs to be backported for these two?

Thanks
Sam
Hui Wang Dec. 18, 2018, 2:11 a.m. UTC | #2
Sorry make use confused. This patch depends on another patch (it is 
based on the branch of master-next-backlog):

This patch fixes a regression introduced by a patch I sent in Nov
(https://lists.ubuntu.com/archives/kernel-team/2018-November/096882.html),
That patch got ack but not formally merged to ubuntu kernel yet, I generated
this patch on the master-next-backlog branch of ubuntu-bionic, so for
B/C/D/unstable kernel, please apply the patch of the (2018-November/096882.html)
first, then apply this patch.

On 2018/12/17 下午5:19, Po-Hsu Lin wrote:
> Seems that this patch cannot be cherry-picked for Bionic / Cosmic.
> Can you please check if this needs to be backported for these two?
>
> Thanks
> Sam
>
Hui Wang Dec. 18, 2018, 2:12 a.m. UTC | #3
s/use/you/ :-)

On 2018/12/18 上午10:11, Hui Wang wrote:
> Sorry make use confused. This patch depends on another patch (it is 
> based on the branch of master-next-backlog):
>
> This patch fixes a regression introduced by a patch I sent in Nov
> (https://lists.ubuntu.com/archives/kernel-team/2018-November/096882.html), 
>
> That patch got ack but not formally merged to ubuntu kernel yet, I 
> generated
> this patch on the master-next-backlog branch of ubuntu-bionic, so for
> B/C/D/unstable kernel, please apply the patch of the 
> (2018-November/096882.html)
> first, then apply this patch.
>
> On 2018/12/17 下午5:19, Po-Hsu Lin wrote:
>> Seems that this patch cannot be cherry-picked for Bionic / Cosmic.
>> Can you please check if this needs to be backported for these two?
>>
>> Thanks
>> Sam
>>
Po-Hsu Lin Dec. 20, 2018, 4:49 a.m. UTC | #4
Ah ok, thanks for the explaination!

As the prerequisite patch has been applied to "master-next-backlog" branch and
will be pick up in January SRU [1], plus clean-cherry pick with chnage limited
to a specific HW:

Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>

[1] https://lists.ubuntu.com/archives/kernel-team/2018-November/096930.html

Patch
diff mbox series

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c2b2cd7580f2..1aec6e22fadc 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6399,6 +6399,8 @@  static const struct hda_fixup alc269_fixups[] = {
 	[ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc285_fixup_invalidate_dacs,
+		.chained = true,
+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI
 	},
 };