summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-11-21 10:03:10 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-21 10:09:02 +0100
commit34c3d1926bdaf45d3a891dd577482abcdd9faa34 (patch)
treea1de25d1cc63664aeb2d560804f0282054eccb51 /sound/pci
parentaf02dde8a609d8d071c4b31a82df811a55690a4a (diff)
downloadblackbird-op-linux-34c3d1926bdaf45d3a891dd577482abcdd9faa34.tar.gz
blackbird-op-linux-34c3d1926bdaf45d3a891dd577482abcdd9faa34.zip
ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
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 Cc: stable@vger.kernel.org (3.6+) Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-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 d5f3a26d608d..3bcb67172358 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -466,6 +466,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;
OpenPOWER on IntegriCloud