summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-11-21 10:03:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 11:47:04 -0800
commitde134053d4084ef640a44f9fd848cb607d2d0457 (patch)
tree25ebaea4f92151783d5bdfc9173cbc1c069837f1 /sound
parent75c23fc13e0f252cc4f3e52d45116b8642c6c61a (diff)
downloadlinux-3.10-de134053d4084ef640a44f9fd848cb607d2d0457.tar.gz
linux-3.10-de134053d4084ef640a44f9fd848cb607d2d0457.tar.bz2
linux-3.10-de134053d4084ef640a44f9fd848cb607d2d0457.zip
ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
commit 34c3d1926bdaf45d3a891dd577482abcdd9faa34 upstream. If this array is not cleared, the jack related code later might fail to create "Internal Speaker Phantom Jack" on Dell Inspiron 3420 and Dell Vostro 2420. BugLink: https://bugs.launchpad.net/bugs/1076840 Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_cirrus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 057f95a2bbb..3605fbb6ef1 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -460,6 +460,7 @@ static int parse_output(struct hda_codec *codec)
memcpy(cfg->speaker_pins, cfg->line_out_pins,
sizeof(cfg->speaker_pins));
cfg->line_outs = 0;
+ memset(cfg->line_out_pins, 0, sizeof(cfg->line_out_pins));
}
return 0;