summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-10-10 16:32:09 +0200
committerTakashi Iwai <tiwai@suse.de>2012-10-10 17:13:22 +0200
commitf7f4b2322bf7b8c5929b7eb5a667091f32592580 (patch)
tree080a627e49b1079694925ab7df6594ac2cfe166c
parent7110005e8d5c3cd418fc4b64f9f124f004422a9a (diff)
downloadop-kernel-dev-f7f4b2322bf7b8c5929b7eb5a667091f32592580.zip
op-kernel-dev-f7f4b2322bf7b8c5929b7eb5a667091f32592580.tar.gz
ALSA: hda - do not detect jack on internal speakers for Realtek
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> Cc: stable@vger.kernel.org Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-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 7bec68c..8253b4e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -611,6 +611,8 @@ static void alc_line_automute(struct hda_codec *codec, struct hda_jack_tbl *jack
{
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;
OpenPOWER on IntegriCloud