From: Harvey Harrison Date: Fri, 29 Feb 2008 10:46:57 +0000 (+0100) Subject: [ALSA] sound: virtuoso.c fix shadowed variable warning X-Git-Tag: v2.6.26-rc1~1087^2~168 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff143874d09a5850e7bf6c68d141243cb12a7b58;p=linux-2.6 [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 Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index d163397b85..e4e2378908 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) static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) { - unsigned int index = chip->controls[control]->private_value & 0xff; + unsigned int priv_idx = chip->controls[control]->private_value & 0xff; u16 value; - value = oxygen_read_ac97(chip, 0, index); + value = oxygen_read_ac97(chip, 0, priv_idx); if (!(value & 0x8000)) { - oxygen_write_ac97(chip, 0, index, value | 0x8000); + oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->controls[control]->id); }