Changeset 358 for GPL/branches/uniaud32-2.0/alsa-kernel/pci/cmipci.c

Timestamp:

Jul 16, 2008, 11:53:49 AM (17 years ago)

Author:

Paul Smedley

Message:

Update uniaud32-2.0 branch to ALSA 1.0.17

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/pci/cmipci.c (modified) (2 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/cmipci.c

@@ -2761 +2761 @@
 
         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;
         }
@@ -2949 +2950 @@
                 snd_cmipci_mixer_write(cm, 0, 0);
 
-                synchronize_irq(cm->irq);
-
                 free_irq(cm->irq, cm);
         }