diff --git a/[refs] b/[refs] index a4e0bf610b3b..cfa42ca48d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3daa92d60552891057b65f278d882348b76fffe +refs/heads/master: ff143874d09a5850e7bf6c68d141243cb12a7b58 diff --git a/trunk/sound/pci/oxygen/virtuoso.c b/trunk/sound/pci/oxygen/virtuoso.c index d163397b85cc..e4e23789080a 100644 --- a/trunk/sound/pci/oxygen/virtuoso.c +++ b/trunk/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); }