diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 13:53:41 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 14:00:16 +0400 |
| commit | 3463d8fa14ba2e00ede9894efdaa65189eb04b36 (patch) | |
| tree | e95e276850a4b831f771f25f9ae93aa7d9bbaafb /sound/pci/es1968.c | |
| parent | 405b0a377cfe3750f4af54b80d0402c3fe777b87 (diff) | |
| download | linux-3463d8fa14ba2e00ede9894efdaa65189eb04b36.tar.xz | |
[ALSA] 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 <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/es1968.c')
| -rw-r--r-- | sound/pci/es1968.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 7d911a18c082..67f03264f871 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -1972,7 +1972,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, @@ -1989,14 +1989,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; } |