From 71db96ddfa72671bd43cacdcc99ca178d90ba267 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Mon, 26 Feb 2018 15:36:38 +0100

Subject: [PATCH] ALSA: hda - Fix pincfg at resume on Lenovo T470 dock

Git-commit: 71db96ddfa72671bd43cacdcc99ca178d90ba267

Patch-mainline: v4.16-rc4

References: bsc#1052235

We've added a quirk to enable the recent Lenovo dock support, where it

overwrites the pin configs of NID 0x17 and 19, not only updating the

pin config cache.  It works right after the boot, but the problem is

that the pin configs are occasionally cleared when the machine goes to

PM.  Meanwhile the quirk writes the pin configs only at the pre-probe,

so this won't be applied any longer.

For addressing that issue, this patch moves the code to overwrite the

pin configs into HDA_FIXUP_ACT_INIT section so that it's always

applied at both probe and resume time.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195161

Fixes: 61fcf8ece9b6 ("ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platform")

Cc: <stable@vger.kernel.org>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 sound/pci/hda/patch_realtek.c |    3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/sound/pci/hda/patch_realtek.c

+++ b/sound/pci/hda/patch_realtek.c

@@ -4997,13 +4997,14 @@ static void alc_fixup_tpt470_dock(struct

 	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

 		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;

+		snd_hda_apply_pincfgs(codec, pincfgs);

+	} else if (action == HDA_FIXUP_ACT_INIT) {

 		/* Enable DOCK device */

 		snd_hda_codec_write(codec, 0x17, 0,

 			    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);

 		/* Enable DOCK device */

 		snd_hda_codec_write(codec, 0x19, 0,

 			    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);

-		snd_hda_apply_pincfgs(codec, pincfgs);

 	}

 }