summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorGabriele Mazzotta <gabriele.mzt@gmail.com>2014-08-08 19:34:41 +0200
committerTakashi Iwai <tiwai@suse.de>2014-08-10 13:28:51 +0200
commitde3da4f696b473e7810bd9837c18bf9fd30a9a6d (patch)
tree4a330a37986685148fef370f202006d329dff711 /sound
parentALSA: hda - Set internal mic as default input source on Dell XPS 13 9333 (diff)
downloadlinux-de3da4f696b473e7810bd9837c18bf9fd30a9a6d.tar.xz
linux-de3da4f696b473e7810bd9837c18bf9fd30a9a6d.zip
ALSA: hda - Fix pop noises on reboot for Dell XPS 13 9333
If nid 0x15 (Headphone Playback Switch) is in D3 and headphones are plugged in when the laptop reboots, a pop noise is generated. Prevent this by keeping nid 0x15 in D0 when headphones are plugged in. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=76611 Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 3ebb7616bf98..6b38ec3c6e57 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4093,7 +4093,7 @@ static unsigned int alc_power_filter_xps13(struct hda_codec *codec,
/* Avoid pop noises when headphones are plugged in */
if (spec->gen.hp_jack_present)
- if (nid == codec->afg || nid == 0x02)
+ if (nid == codec->afg || nid == 0x02 || nid == 0x15)
return AC_PWRST_D0;
return power_state;
}