Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 405b0a37 authored by Harvey Harrison's avatar Harvey Harrison Committed by Takashi Iwai
Browse files

[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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7dfa31ed

sound/pci/ens1370.c

+3 −3
Original line number Diff line number Diff line
@@ -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;