diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 11:53:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:16 +0200 |
commit | 405b0a377cfe3750f4af54b80d0402c3fe777b87 (patch) | |
tree | 6fe1b3a2d10f8a10dcd8115f5fb7d140d3c4cebc /sound/pci/ens1370.c | |
parent | 7dfa31ed5e1fc0ace7f1959b9564ad43d78fd7af (diff) | |
download | talos-obmc-linux-405b0a377cfe3750f4af54b80d0402c3fe777b87.tar.gz talos-obmc-linux-405b0a377cfe3750f4af54b80d0402c3fe777b87.zip |
[ALSA] sound: ens1370.c fix shadowed variable warning
index is incremented only when AC97_EI_SPDIF and then assigned to
the index field. Change the temporary name to is_spdif.
sound/pci/ens1370.c:1638:10: warning: symbol 'index' shadows an earlier one
sound/pci/ens1370.c:84:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ens1370.c')
-rw-r--r-- | sound/pci/ens1370.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 72d85a5ae6a0..52fae4a7cfdd 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -1635,20 +1635,20 @@ static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq, if (has_spdif > 0 || (!has_spdif && es1371_quirk_lookup(ensoniq, es1371_spdif_present))) { struct snd_kcontrol *kctl; - int i, index = 0; + int i, is_spdif = 0; ensoniq->spdif_default = ensoniq->spdif_stream = SNDRV_PCM_DEFAULT_CON_SPDIF; outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS)); if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF) - index++; + is_spdif++; for (i = 0; i < ARRAY_SIZE(snd_es1371_mixer_spdif); i++) { kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq); if (!kctl) return -ENOMEM; - kctl->id.index = index; + kctl->id.index = is_spdif; err = snd_ctl_add(card, kctl); if (err < 0) return err; |