Changeset 772 for GPL/trunk/alsa-kernel/pci/cmipci.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/cmipci.c (modified) (5 diffs)

GPL/trunk/alsa-kernel/pci/cmipci.c

@@ -2709 +2709 @@
                 if (cm->can_ac3_hw) {
                         kctl = snd_ctl_new1(&snd_cmipci_spdif_default, cm);
+                        kctl->id.device = pcm_spdif_device;
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
+                        kctl = snd_ctl_new1(&snd_cmipci_spdif_mask, cm);
                         kctl->id.device = pcm_spdif_device;
-                        kctl = snd_ctl_new1(&snd_cmipci_spdif_mask, cm);
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
+                        kctl = snd_ctl_new1(&snd_cmipci_spdif_stream, cm);
                         kctl->id.device = pcm_spdif_device;
-                        kctl = snd_ctl_new1(&snd_cmipci_spdif_stream, cm);
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
-                        kctl->id.device = pcm_spdif_device;
                 }
                 if (cm->chip_version <= 37) {
@@ -2755 +2755 @@
 
         for (idx = 0; idx < CM_SAVED_MIXERS; idx++) {
-                struct snd_ctl_elem_id elem_id;
                 struct snd_kcontrol *ctl;
-                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);
+                ctl = snd_ctl_find_id_mixer(cm->card, cm_saved_mixer[idx].name);
                 if (ctl)
                         cm->mixer_res_ctl[idx] = ctl;
@@ -3127 +3123 @@
         sprintf(card->shortname, "C-Media CMI%d", val);
         if (cm->chip_version < 68)
-                sprintf(modelstr, " (model %d)", cm->chip_version);
+                scnprintf(modelstr, sizeof(modelstr),
+                          " (model %d)", cm->chip_version);
         else
                 modelstr[0] = '\0';
-        sprintf(card->longname, "%s%s at %#lx, irq %i",
-                card->shortname, modelstr, cm->iobase, cm->irq);
+        scnprintf(card->longname, sizeof(card->longname),
+                  "%s%s at %#lx, irq %i",
+                  card->shortname, modelstr, cm->iobase, cm->irq);
 
         if (cm->chip_version >= 39) {
@@ -3238 +3236 @@
         static int dev;
         struct snd_card *card;
-        struct cmipci *cm;
         int err;
 
@@ -3249 +3246 @@
 
         err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                                sizeof(*cm), &card);
+                                sizeof(struct cmipci), &card);
         if (err < 0)
                 return err;
-        cm = card->private_data;
         
         switch (pci->device) {