From f1e9ccf0d49a1c7a4e4c7461ae4f67c71fbd299b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 24 Jan 2006 10:34:34 +0100 Subject: [PATCH] --- yaml --- r: 19579 b: refs/heads/master c: ad0651f97a3f8c5982921cb57fbedc877279e03d h: refs/heads/master i: 19577: 94b2a97f3176642fa3769b048f21b3a7fd612dcb 19575: e2d0ae0ea1ad20c6b5a5309a3f6915d419e16a18 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c412bea4e95..c85834aa50f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 802c00f2f3700423df06a1149c23cd60dd59159c +refs/heads/master: ad0651f97a3f8c5982921cb57fbedc877279e03d diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index d5342d20bd81..f7892a5b7757 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -691,7 +691,13 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec, const struct aut AC_VERB_GET_CONNECT_LIST, 0) & 0xff; } - spec->multiout.num_dacs = cfg->line_outs; + if (cfg->line_outs) + spec->multiout.num_dacs = cfg->line_outs; + else if (cfg->hp_pin) { + spec->multiout.dac_nids[0] = snd_hda_codec_read(codec, cfg->hp_pin, 0, + AC_VERB_GET_CONNECT_LIST, 0) & 0xff; + spec->multiout.num_dacs = 1; + } return 0; }