From 9c8f0ffca13f96027dadf7618916fbdd411f2eee Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 28 Feb 2008 11:52:17 +0100 Subject: [PATCH] --- yaml --- r: 92076 b: refs/heads/master c: 7dfa31ed5e1fc0ace7f1959b9564ad43d78fd7af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/cmipci.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 30e0839a27bf..586fb8393dfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 964a788e0ba64aa4ce2e6488718f3ee28cc2e61e +refs/heads/master: 7dfa31ed5e1fc0ace7f1959b9564ad43d78fd7af diff --git a/trunk/sound/pci/cmipci.c b/trunk/sound/pci/cmipci.c index 135f30860753..4074584a7d90 100644 --- a/trunk/sound/pci/cmipci.c +++ b/trunk/sound/pci/cmipci.c @@ -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; }