aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-29 05:46:57 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:18 -0400
commitff143874d09a5850e7bf6c68d141243cb12a7b58 (patch)
treec19f27db0c648b21d8d90a48ad7a17845c7c1fee
parentc3daa92d60552891057b65f278d882348b76fffe (diff)
[ALSA] sound: virtuoso.c fix shadowed variable warning
Use priv_idx as an identifier. sound/pci/oxygen/virtuoso.c:277:15: warning: symbol 'index' shadows an earlier one sound/pci/oxygen/virtuoso.c:56:12: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/oxygen/virtuoso.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index d163397b85cc..e4e23789080a 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -274,12 +274,12 @@ static void xonar_gpio_changed(struct oxygen *chip)
274 274
275static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) 275static void mute_ac97_ctl(struct oxygen *chip, unsigned int control)
276{ 276{
277 unsigned int index = chip->controls[control]->private_value & 0xff; 277 unsigned int priv_idx = chip->controls[control]->private_value & 0xff;
278 u16 value; 278 u16 value;
279 279
280 value = oxygen_read_ac97(chip, 0, index); 280 value = oxygen_read_ac97(chip, 0, priv_idx);
281 if (!(value & 0x8000)) { 281 if (!(value & 0x8000)) {
282 oxygen_write_ac97(chip, 0, index, value | 0x8000); 282 oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000);
283 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, 283 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
284 &chip->controls[control]->id); 284 &chip->controls[control]->id);
285 } 285 }