summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-07 15:12:55 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-07 16:08:13 +0200
commita926757f0431042b32ef4188ce8201cbe0fcbb50 (patch)
tree91cc2fb1843733b9b288c20c97399e9fc083c03f
parentALSA: hda - Clean-up PCM assignments in patch_realtek.c (diff)
downloadlinux-a926757f0431042b32ef4188ce8201cbe0fcbb50.tar.xz
linux-a926757f0431042b32ef4188ce8201cbe0fcbb50.zip
ALSA: hda - Fix warning with ALC882 digital-out detection
The digital out pin on ALC882 may have multiple connections. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2e7afd434525..53188c4cbf75 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2080,11 +2080,13 @@ static void alc_auto_parse_digital(struct hda_codec *codec)
/* support multiple SPDIFs; the secondary is set up as a slave */
for (i = 0; i < spec->autocfg.dig_outs; i++) {
+ hda_nid_t conn[4];
err = snd_hda_get_connections(codec,
spec->autocfg.dig_out_pins[i],
- &dig_nid, 1);
+ conn, ARRAY_SIZE(conn));
if (err < 0)
continue;
+ dig_nid = conn[0]; /* assume the first element is audio-out */
if (!i) {
spec->multiout.dig_out_nid = dig_nid;
spec->dig_out_type = spec->autocfg.dig_out_type[0];