|
@@ -1972,7 +1972,7 @@ snd_es1968_mixer(struct es1968 *chip)
|
|
{
|
|
{
|
|
struct snd_ac97_bus *pbus;
|
|
struct snd_ac97_bus *pbus;
|
|
struct snd_ac97_template ac97;
|
|
struct snd_ac97_template ac97;
|
|
- struct snd_ctl_elem_id id;
|
|
|
|
|
|
+ struct snd_ctl_elem_id elem_id;
|
|
int err;
|
|
int err;
|
|
static struct snd_ac97_bus_ops ops = {
|
|
static struct snd_ac97_bus_ops ops = {
|
|
.write = snd_es1968_ac97_write,
|
|
.write = snd_es1968_ac97_write,
|
|
@@ -1989,14 +1989,14 @@ snd_es1968_mixer(struct es1968 *chip)
|
|
return err;
|
|
return err;
|
|
|
|
|
|
/* attach master switch / volumes for h/w volume control */
|
|
/* 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;
|
|
return 0;
|
|
}
|
|
}
|