Merge branch 'for-linus' into for-next

2012-11-22 21:22:39 +01:00
parent 2efa1d59fe 947d299686
commit 2ba509a6ba
178 changed files with 1978 additions and 1011 deletions
--- 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;