summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_cirrus.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-05 10:08:30 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-05 10:08:30 +0200
commit69b5de84758237ee0086554849489baeeafcd097 (patch)
tree373f1271758414b5982270bec295ac500acbb8a6 /sound/pci/hda/patch_cirrus.c
parentbfe70783ca8e61f1fc3588cd59c4f1b755e9d3cf (diff)
parent8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 (diff)
downloadtalos-obmc-linux-69b5de84758237ee0086554849489baeeafcd097.tar.gz
talos-obmc-linux-69b5de84758237ee0086554849489baeeafcd097.zip
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r--sound/pci/hda/patch_cirrus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 7de782a5b8f4..350ee8ac4153 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec)
for (n = 0; n < AUTO_PIN_LAST; n++) {
if (!spec->adc_nid[n])
continue;
- err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]);
+ err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]);
if (err < 0)
return err;
}
OpenPOWER on IntegriCloud