[ALSA] sound: cmipci.c fix shadowed variable warning
A temporary variable for each mixer element is used in an initialization loop, use the name elem_id. sound/pci/cmipci.c:2747:26: warning: symbol 'id' shadows an earlier one sound/pci/cmipci.c:56:13: originally declared here [tiwai - fixed a coding style issue as well] Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
964a788e0b
Коммит
7dfa31ed5e
|
@ -2744,12 +2744,13 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic
|
|||
}
|
||||
|
||||
for (idx = 0; idx < CM_SAVED_MIXERS; idx++) {
|
||||
struct snd_ctl_elem_id id;
|
||||
struct snd_ctl_elem_id elem_id;
|
||||
struct snd_kcontrol *ctl;
|
||||
memset(&id, 0, sizeof(id));
|
||||
id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
|
||||
strcpy(id.name, cm_saved_mixer[idx].name);
|
||||
if ((ctl = snd_ctl_find_id(cm->card, &id)) != NULL)
|
||||
memset(&elem_id, 0, sizeof(elem_id));
|
||||
elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
|
||||
strcpy(elem_id.name, cm_saved_mixer[idx].name);
|
||||
ctl = snd_ctl_find_id(cm->card, &elem_id);
|
||||
if (ctl)
|
||||
cm->mixer_res_ctl[idx] = ctl;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче