---

yaml --- r: 257695 b: refs/heads/master c: 6aadf41 h: refs/heads/master i: 257693: 853574a 257691: ba35265 257687: 61ba2f0 257679: ac6f908 257663: 3b9d91d v: v3
git-mirror · Jun 20, 2011 · a6446da · a6446da
1 parent 6308d25
commit a6446da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13af8e77ea3e0dff80db9b2e0007535c21d49094
+refs/heads/master: 6aadf41d6b9f8da68db5962929c07f816db15893
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -1770,7 +1770,11 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)
 			if (err < 0)
 				return err;
 		} else {
-			err = create_ch_ctls(codec, chname[i], pin, dac, 3);
+			const char *pfx = chname[i];
+			if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
+			    cfg->line_outs == 1)
+				pfx = "Speaker";
+			err = create_ch_ctls(codec, pfx, pin, dac, 3);
 			if (err < 0)
 				return err;
 		}