diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 05:53:41 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:16 -0400 |
commit | 3463d8fa14ba2e00ede9894efdaa65189eb04b36 (patch) | |
tree | e95e276850a4b831f771f25f9ae93aa7d9bbaafb /sound | |
parent | 405b0a377cfe3750f4af54b80d0402c3fe777b87 (diff) |
[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')
-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) | |||
1972 | { | 1972 | { |
1973 | struct snd_ac97_bus *pbus; | 1973 | struct snd_ac97_bus *pbus; |
1974 | struct snd_ac97_template ac97; | 1974 | struct snd_ac97_template ac97; |
1975 | struct snd_ctl_elem_id id; | 1975 | struct snd_ctl_elem_id elem_id; |
1976 | int err; | 1976 | int err; |
1977 | static struct snd_ac97_bus_ops ops = { | 1977 | static struct snd_ac97_bus_ops ops = { |
1978 | .write = snd_es1968_ac97_write, | 1978 | .write = snd_es1968_ac97_write, |
@@ -1989,14 +1989,14 @@ snd_es1968_mixer(struct es1968 *chip) | |||
1989 | return err; | 1989 | return err; |
1990 | 1990 | ||
1991 | /* attach master switch / volumes for h/w volume control */ | 1991 | /* attach master switch / volumes for h/w volume control */ |
1992 | memset(&id, 0, sizeof(id)); | 1992 | memset(&elem_id, 0, sizeof(elem_id)); |
1993 | id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; | 1993 | elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; |
1994 | strcpy(id.name, "Master Playback Switch"); | 1994 | strcpy(elem_id.name, "Master Playback Switch"); |
1995 | chip->master_switch = snd_ctl_find_id(chip->card, &id); | 1995 | chip->master_switch = snd_ctl_find_id(chip->card, &elem_id); |
1996 | memset(&id, 0, sizeof(id)); | 1996 | memset(&elem_id, 0, sizeof(elem_id)); |
1997 | id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; | 1997 | elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; |
1998 | strcpy(id.name, "Master Playback Volume"); | 1998 | strcpy(elem_id.name, "Master Playback Volume"); |
1999 | chip->master_volume = snd_ctl_find_id(chip->card, &id); | 1999 | chip->master_volume = snd_ctl_find_id(chip->card, &elem_id); |
2000 | 2000 | ||
2001 | return 0; | 2001 | return 0; |
2002 | } | 2002 | } |