---

yaml --- r: 270385 b: refs/heads/master c: 0650367 h: refs/heads/master i: 270383: 687e79c v: v3
git-mirror · Oct 6, 2011 · 608a48a · 608a48a
1 parent 9348b8f
commit 608a48a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f71ff0d713a85f647c16fbe44d2a12bbcc25add3
+refs/heads/master: 06503670afc4372186d691ab2b9298a5e86fa29f
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -3731,7 +3731,8 @@ static int alc_parse_auto_config(struct hda_codec *codec,
 		return 0; /* can't find valid BIOS pin config */
 	}
 
-	if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && cfg->hp_outs > 0) {
+	if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
+	    cfg->line_outs <= cfg->hp_outs) {
 		/* use HP as primary out */
 		cfg->speaker_outs = cfg->line_outs;
 		memcpy(cfg->speaker_pins, cfg->line_out_pins,