Commit fec88dea authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/hda' into topic/hda

parents 4e7d7c60 01fdf180
...@@ -1759,12 +1759,22 @@ static void alc_auto_parse_digital(struct hda_codec *codec) ...@@ -1759,12 +1759,22 @@ static void alc_auto_parse_digital(struct hda_codec *codec)
} }
if (spec->autocfg.dig_in_pin) { if (spec->autocfg.dig_in_pin) {
hda_nid_t dig_nid; dig_nid = codec->start_nid;
err = snd_hda_get_connections(codec, for (i = 0; i < codec->num_nodes; i++, dig_nid++) {
spec->autocfg.dig_in_pin, unsigned int wcaps = get_wcaps(codec, dig_nid);
&dig_nid, 1); if (get_wcaps_type(wcaps) != AC_WID_AUD_IN)
if (err > 0) continue;
spec->dig_in_nid = dig_nid; 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;
}
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment