summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_cirrus.c
diff options
context:
space:
mode:
authorTakashi Iwai2012-11-22 21:22:39 +0100
committerTakashi Iwai2012-11-22 21:22:39 +0100
commit2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch)
tree08470935de327cb438cc9ec738b0e025c3c0b556 /sound/pci/hda/patch_cirrus.c
parentALSA: emu10k1: Add missing ifdef for emu->suspend reference (diff)
parentALSA: snd-usb: properly initialize the sync endpoint (diff)
downloadkernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.gz
kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz
kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-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 f99cbf942b8d..ed981723cdd5 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -473,6 +473,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;