---

yaml --- r: 133107 b: refs/heads/master c: ee58a7c h: refs/heads/master i: 133105: bd63e1c 133103: f67dcee v: v3
git-mirror · Mar 6, 2009 · 6c8ab65 · 6c8ab65
1 parent ed3d4f6
commit 6c8ab65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668b9652be33510a2a42b290dd335d34d38e2068
+refs/heads/master: ee58a7ca21b2acf0d7ad0e1eb2f8d916ecf9fadc
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -2871,6 +2871,16 @@ static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid)
 			return conn[j];
 		}
 	}
+	/* if all DACs are already assigned, connect to the primary DAC */
+	if (conn_len > 1) {
+		for (j = 0; j < conn_len; j++) {
+			if (conn[j] == spec->multiout.dac_nids[0]) {
+				snd_hda_codec_write_cache(codec, nid, 0,
+						  AC_VERB_SET_CONNECT_SEL, j);
+				break;
+			}
+		}
+	}
 	return 0;
 }