diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-24 09:09:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-24 09:09:42 +0200 |
| commit | 01fdf1801e349302fce5d9865470a7100a2d9b74 (patch) | |
| tree | b4de9b15d4bea72d320bbab18838e94bb2c0982b /sound/pci/hda/patch_realtek.c | |
| parent | 0f9f1ee9d1412d45a22bfd69dfd4d4324b506e9e (diff) | |
| download | op-kernel-dev-01fdf1801e349302fce5d9865470a7100a2d9b74.zip op-kernel-dev-01fdf1801e349302fce5d9865470a7100a2d9b74.tar.gz | |
ALSA: hda - Fix auto-parse of SPDIF input of Realtek codecs
The SPDIF in audio widget must be searched through the list as the widget
that contains the given pin as the connection source. The current code
was implemented in a reverse way.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a1312a6..a432e6e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1594,12 +1594,22 @@ static void alc_auto_parse_digital(struct hda_codec *codec) } if (spec->autocfg.dig_in_pin) { - hda_nid_t dig_nid; - err = snd_hda_get_connections(codec, - spec->autocfg.dig_in_pin, - &dig_nid, 1); - if (err > 0) - spec->dig_in_nid = dig_nid; + dig_nid = codec->start_nid; + for (i = 0; i < codec->num_nodes; i++, dig_nid++) { + unsigned int wcaps = get_wcaps(codec, dig_nid); + if (get_wcaps_type(wcaps) != AC_WID_AUD_IN) + continue; + if (!(wcaps & AC_WCAP_DIGITAL)) + continue; + if (!(wcaps & AC_WCAP_CONN_LIST)) + continue; + err = get_connection_index(codec, dig_nid, + spec->autocfg.dig_in_pin); + if (err >= 0) { + spec->dig_in_nid = dig_nid; + break; + } + } } } |
