]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jan 2019 10:51:08 +0000 (11:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jan 2019 10:51:08 +0000 (11:51 +0100)
added patches:
alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch

queue-4.9/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch b/queue-4.9/alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch
new file mode 100644 (file)
index 0000000..e242c11
--- /dev/null
@@ -0,0 +1,69 @@
+From d1dd42110d2727e81b9265841a62bc84c454c3a2 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 9 Jan 2019 17:05:24 +0800
+Subject: ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit d1dd42110d2727e81b9265841a62bc84c454c3a2 upstream.
+
+Disable Headset Mic VREF for headset mode of ALC225.
+This will be controlled by coef bits of headset mode functions.
+
+[ Fixed a compile warning and code simplification -- tiwai ]
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4841,6 +4841,13 @@ static void alc280_fixup_hp_9480m(struct
+       }
+ }
++static void alc_fixup_disable_mic_vref(struct hda_codec *codec,
++                                const struct hda_fixup *fix, int action)
++{
++      if (action == HDA_FIXUP_ACT_PRE_PROBE)
++              snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
++}
++
+ /* for hda_fixup_thinkpad_acpi() */
+ #include "thinkpad_helper.c"
+@@ -4947,6 +4954,7 @@ enum {
+       ALC293_FIXUP_LENOVO_SPK_NOISE,
+       ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
+       ALC255_FIXUP_DELL_SPK_NOISE,
++      ALC225_FIXUP_DISABLE_MIC_VREF,
+       ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
+       ALC295_FIXUP_DISABLE_DAC3,
+       ALC280_FIXUP_HP_HEADSET_MIC,
+@@ -5605,6 +5613,12 @@ static const struct hda_fixup alc269_fix
+               .chained = true,
+               .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
+       },
++      [ALC225_FIXUP_DISABLE_MIC_VREF] = {
++              .type = HDA_FIXUP_FUNC,
++              .v.func = alc_fixup_disable_mic_vref,
++              .chained = true,
++              .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
++      },
+       [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+               .type = HDA_FIXUP_VERBS,
+               .v.verbs = (const struct hda_verb[]) {
+@@ -5614,7 +5628,7 @@ static const struct hda_fixup alc269_fix
+                       {}
+               },
+               .chained = true,
+-              .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
++              .chain_id = ALC225_FIXUP_DISABLE_MIC_VREF
+       },
+       [ALC280_FIXUP_HP_HEADSET_MIC] = {
+               .type = HDA_FIXUP_FUNC,
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1a112bbcb1ea50151f8d084faec571fb69d3c0b6 100644 (file)
@@ -0,0 +1 @@
+alsa-hda-realtek-disable-headset-mic-vref-for-headset-mode-of-alc225.patch