diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 05:53:07 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:16 -0400 |
commit | 405b0a377cfe3750f4af54b80d0402c3fe777b87 (patch) | |
tree | 6fe1b3a2d10f8a10dcd8115f5fb7d140d3c4cebc /sound/pci/ens1370.c | |
parent | 7dfa31ed5e1fc0ace7f1959b9564ad43d78fd7af (diff) |
[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, | |||
1635 | if (has_spdif > 0 || | 1635 | if (has_spdif > 0 || |
1636 | (!has_spdif && es1371_quirk_lookup(ensoniq, es1371_spdif_present))) { | 1636 | (!has_spdif && es1371_quirk_lookup(ensoniq, es1371_spdif_present))) { |
1637 | struct snd_kcontrol *kctl; | 1637 | struct snd_kcontrol *kctl; |
1638 | int i, index = 0; | 1638 | int i, is_spdif = 0; |
1639 | 1639 | ||
1640 | ensoniq->spdif_default = ensoniq->spdif_stream = | 1640 | ensoniq->spdif_default = ensoniq->spdif_stream = |
1641 | SNDRV_PCM_DEFAULT_CON_SPDIF; | 1641 | SNDRV_PCM_DEFAULT_CON_SPDIF; |
1642 | outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS)); | 1642 | outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS)); |
1643 | 1643 | ||
1644 | if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF) | 1644 | if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF) |
1645 | index++; | 1645 | is_spdif++; |
1646 | 1646 | ||
1647 | for (i = 0; i < ARRAY_SIZE(snd_es1371_mixer_spdif); i++) { | 1647 | for (i = 0; i < ARRAY_SIZE(snd_es1371_mixer_spdif); i++) { |
1648 | kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq); | 1648 | kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq); |
1649 | if (!kctl) | 1649 | if (!kctl) |
1650 | return -ENOMEM; | 1650 | return -ENOMEM; |
1651 | kctl->id.index = index; | 1651 | kctl->id.index = is_spdif; |
1652 | err = snd_ctl_add(card, kctl); | 1652 | err = snd_ctl_add(card, kctl); |
1653 | if (err < 0) | 1653 | if (err < 0) |
1654 | return err; | 1654 | return err; |