From 6c8ab65cb537d66b35f470f0b28f3ad77f548cc7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 6 Mar 2009 12:00:24 +0100 Subject: [PATCH] --- yaml --- r: 133107 b: refs/heads/master c: ee58a7ca21b2acf0d7ad0e1eb2f8d916ecf9fadc h: refs/heads/master i: 133105: bd63e1c6c16cdd26178811e68fef2304b737675b 133103: f67dcee08c9d5e9433f44968e3a3227866176a9b v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 14486fa67a31..3ba6252b5807 100644 --- 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 index d19090fd2d13..ee119259183c 100644 --- 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; }