aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-10-10 16:32:09 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-10-30 23:26:42 +0000
commit6780e9e1d9f227fc2cf1ff966f43a5d794086e79 (patch)
treec17901838dd85a924de6544d0bd3a034a88ae75e /sound/pci/hda/patch_realtek.c
parent3b0622adf033c6ed9cc35adfcfc8dfad20c56445 (diff)
downloadkernel_samsung_smdk4412-6780e9e1d9f227fc2cf1ff966f43a5d794086e79.zip
kernel_samsung_smdk4412-6780e9e1d9f227fc2cf1ff966f43a5d794086e79.tar.gz
kernel_samsung_smdk4412-6780e9e1d9f227fc2cf1ff966f43a5d794086e79.tar.bz2
ALSA: hda - do not detect jack on internal speakers for Realtek
commit f7f4b2322bf7b8c5929b7eb5a667091f32592580 upstream. This caused the internal speaker to mute itself because it was present, which happened after powersave. It was found on Dell XPS 15 (L502x), ALC665. Reported-by: Da Fox <da.fox.mail@gmail.com> Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 32c8169..f979b890 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -620,6 +620,8 @@ static void alc_line_automute(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
+ if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
+ return;
/* check LO jack only when it's different from HP */
if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0])
return;