Changeset 772 for GPL/trunk/alsa-kernel/pci/es1968.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/es1968.c (modified) (2 diffs)

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

@@ -2042 +2042 @@
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
-#ifndef CONFIG_SND_ES1968_INPUT
-        struct snd_ctl_elem_id elem_id;
-#endif
         int err;
         static const struct snd_ac97_bus_ops ops = {
@@ -2064 +2061 @@
 #ifndef CONFIG_SND_ES1968_INPUT
         /* attach master switch / volumes for h/w volume control */
-        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);
+        chip->master_switch = snd_ctl_find_id_mixer(chip->card,
+                                                    "Master Playback Switch");
+        chip->master_volume = snd_ctl_find_id_mixer(chip->card,
+                                                    "Master Playback Volume");
 #endif