sound: es1968.c fox shadowed variable warning
PATCH 3/12 sound: es1968.c fox shadowed variable warning
id is used when initializing the mixer elements, use elem_id here instead.sound/pci/es1968.c:1963:25: warning: symbol 'id' shadows an earlier one sound/pci/es1968.c:129:13: originally declared here
Signed-off-by Harvey Harrison <[email protected]>
--- sound/pci/es1968.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
sound/pci/es1968.c +9 -9
@@ -1960,7 +1960,7 @@ snd_es1968_mixer(struct es1968 *chip) {struct snd_ac97_bus *pbus;struct snd_ac97_template ac97; -struct snd_ctl_elem_id id; +struct snd_ctl_elem_id elem_id;int err;static struct snd_ac97_bus_ops ops = { .write = snd_es1968_ac97_write,
@@ -1977,14 +1977,14 @@ snd_es1968_mixer(struct es1968 *chip)return err;/* attach master switch / volumes for h/w volume control */ -memset (&id,0 ,sizeof (id)); - id.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; -strcpy (id.name,"Master Playback Switch" ); - chip->master_switch =snd_ctl_find_id (chip->card, &id); -memset (&id,0 ,sizeof (id)); - id.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; -strcpy (id.name,"Master Playback Volume" ); - chip->master_volume =snd_ctl_find_id (chip->card, &id); +memset (&elem_id,0 ,sizeof (elem_id)); + elem_id.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; +strcpy (elem_id.name,"Master Playback Switch" ); + chip->master_switch =snd_ctl_find_id (chip->card, &elem_id); +memset (&elem_id,0 ,sizeof (elem_id)); + elem_id.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; +strcpy (elem_id.name,"Master Playback Volume" ); + chip->master_volume =snd_ctl_find_id (chip->card, &elem_id);return 0 ; }
Signature · 1 line
1.5.4.3.342.g99e8