Changeset 772 for GPL/trunk/alsa-kernel/pci/ac97

Timestamp:

Apr 19, 2025, 8:08:37 PM (7 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/ac97/ac97_codec.c (modified) (6 diffs)
• alsa-kernel/pci/ac97/ac97_patch.c (modified) (4 diffs)
• alsa-kernel/pci/ac97/ac97_pcm.c (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/ac97/ac97_codec.c

@@ -153 +153 @@
 { 0x4e534331, 0xffffffff, "LM4549",             NULL,           NULL },
 { 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix
-{ 0x50534304, 0xffffffff, "UCB1400",            patch_ucb1400,  NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
 { 0x53544d02, 0xffffffff, "ST7597",             NULL,           NULL },
@@ -2057 +2056 @@
         if (err < 0) {
                 ac97_err(ac97, "Can't register ac97 bus\n");
+                put_device(&ac97->dev);
                 ac97->dev.bus = NULL;
                 return err;
@@ -2121 +2121 @@
         };
 
-        if (rac97)
-                *rac97 = NULL;
-        if (snd_BUG_ON(!bus || !template))
+        if (snd_BUG_ON(!bus || !template || !rac97))
                 return -EINVAL;
+        *rac97 = NULL;
         if (snd_BUG_ON(template->num >= 4))
                 return -EINVAL;
@@ -2709 +2708 @@
 static void set_ctl_name(char *dst, const char *src, const char *suffix)
 {
-        if (suffix)
-                sprintf(dst, "%s %s", src, suffix);
-        else
-                strcpy(dst, src);
-}       
+        const size_t msize = SNDRV_CTL_ELEM_ID_NAME_MAXLEN;
+
+        if (suffix) {
+                if (snprintf(dst, msize, "%s %s", src, suffix) >= msize)
+                        pr_warn("ALSA: AC97 control name '%s %s' truncated to '%s'\n",
+                                src, suffix, dst);
+        } else {
+                if (strscpy(dst, src, msize) < 0)
+                        pr_warn("ALSA: AC97 control name '%s' truncated to '%s'\n",
+                                src, dst);
+        }
+}
 
 /* remove the control with the given name and optional suffix */
@@ -2740 +2746 @@
 {
         struct snd_kcontrol *kctl = ctl_find(ac97, src, suffix);
+        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+
         if (kctl) {
-                set_ctl_name(kctl->id.name, dst, suffix);
+                set_ctl_name(name, dst, suffix);
+                snd_ctl_rename(ac97->bus->card, kctl, name);
                 return 0;
         }
@@ -2760 +2769 @@
 {
         struct snd_kcontrol *kctl1, *kctl2;
+        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+
         kctl1 = ctl_find(ac97, s1, suffix);
         kctl2 = ctl_find(ac97, s2, suffix);
         if (kctl1 && kctl2) {
-                set_ctl_name(kctl1->id.name, s2, suffix);
-                set_ctl_name(kctl2->id.name, s1, suffix);
+                set_ctl_name(name, s2, suffix);
+                snd_ctl_rename(ac97->bus->card, kctl1, name);
+
+                set_ctl_name(name, s1, suffix);
+                snd_ctl_rename(ac97->bus->card, kctl2, name);
+
                 return 0;
         }

GPL/trunk/alsa-kernel/pci/ac97/ac97_patch.c

@@ -3432 +3432 @@
                                                     const char *name)
 {
-        struct snd_ctl_elem_id id;
-        memset(&id, 0, sizeof(id));
-        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(id.name, name);
-        return snd_ctl_find_id(ac97->bus->card, &id);
+        return snd_ctl_find_id_mixer(ac97->bus->card, name);
 }
 
@@ -3445 +3441 @@
 {
         struct snd_kcontrol *kctl;
-        const char * const *s;
         int err;
 
@@ -3455 +3450 @@
                 return err;
 
-        for (s = followers; *s; s++) {
-                struct snd_kcontrol *sctl;
-
-                sctl = snd_ac97_find_mixer_ctl(ac97, *s);
-                if (!sctl) {
-                        dev_dbg(ac97->bus->card->dev,
-                                "Cannot find follower %s, skipped\n", *s);
-                        continue;
-                }
-                err = snd_ctl_add_follower(kctl, sctl);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+        return snd_ctl_add_followers(ac97->bus->card, kctl, followers);
 }
 
@@ -3938 +3920 @@
         return 0;
 }
-
-/* 
- *  UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-02.pdf)
- */
-static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = {
-/* enable/disable headphone driver which allows direct connection to
-   stereo headphone without the use of external DC blocking
-   capacitors */
-AC97_SINGLE("Headphone Driver", 0x6a, 6, 1, 0),
-/* Filter used to compensate the DC offset is added in the ADC to remove idle
-   tones from the audio band. */
-AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0),
-/* Control smart-low-power mode feature. Allows automatic power down
-   of unused blocks in the ADC analog front end and the PLL. */
-AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0),
-};
-
-static int patch_ucb1400_specific(struct snd_ac97 * ac97)
-{
-        int idx, err;
-        for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++) {
-                err = snd_ctl_add(ac97->bus->card, snd_ctl_new1(&snd_ac97_controls_ucb1400[idx], ac97));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-
-static const struct snd_ac97_build_ops patch_ucb1400_ops = {
-        .build_specific = patch_ucb1400_specific,
-};
-
-static int patch_ucb1400(struct snd_ac97 * ac97)
-{
-        ac97->build_ops = &patch_ucb1400_ops;
-        /* enable headphone driver and smart low power mode by default */
-        snd_ac97_write_cache(ac97, 0x6a, 0x0050);
-        snd_ac97_write_cache(ac97, 0x6c, 0x0030);
-        return 0;
-}

GPL/trunk/alsa-kernel/pci/ac97/ac97_pcm.c

@@ -232 +232 @@
  * for SPDIF).
  *
- * The valid registers are AC97_PMC_MIC_ADC_RATE,
+ * The valid registers are AC97_PCM_MIC_ADC_RATE,
  * AC97_PCM_FRONT_DAC_RATE, AC97_PCM_LR_ADC_RATE.
  * AC97_PCM_SURR_DAC_RATE and AC97_PCM_LFE_DAC_RATE are accepted