diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index d4fd94805e7f..f6a9a5dd9b74 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -2671,8 +2671,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
2671 | struct auto_pin_cfg *cfg, | 2671 | struct auto_pin_cfg *cfg, |
2672 | hda_nid_t *ignore_nids) | 2672 | hda_nid_t *ignore_nids) |
2673 | { | 2673 | { |
2674 | hda_nid_t nid, nid_start; | 2674 | hda_nid_t nid, end_nid; |
2675 | int nodes; | ||
2676 | short seq, assoc_line_out, assoc_speaker; | 2675 | short seq, assoc_line_out, assoc_speaker; |
2677 | short sequences_line_out[ARRAY_SIZE(cfg->line_out_pins)]; | 2676 | short sequences_line_out[ARRAY_SIZE(cfg->line_out_pins)]; |
2678 | short sequences_speaker[ARRAY_SIZE(cfg->speaker_pins)]; | 2677 | short sequences_speaker[ARRAY_SIZE(cfg->speaker_pins)]; |
@@ -2685,8 +2684,8 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
2685 | memset(sequences_hp, 0, sizeof(sequences_hp)); | 2684 | memset(sequences_hp, 0, sizeof(sequences_hp)); |
2686 | assoc_line_out = assoc_speaker = 0; | 2685 | assoc_line_out = assoc_speaker = 0; |
2687 | 2686 | ||
2688 | nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start); | 2687 | end_nid = codec->start_nid + codec->num_nodes; |
2689 | for (nid = nid_start; nid < nodes + nid_start; nid++) { | 2688 | for (nid = codec->start_nid; nid < end_nid; nid++) { |
2690 | unsigned int wid_caps = get_wcaps(codec, nid); | 2689 | unsigned int wid_caps = get_wcaps(codec, nid); |
2691 | unsigned int wid_type = | 2690 | unsigned int wid_type = |
2692 | (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; | 2691 | (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; |