Changeset 711 for GPL/branches/uniaud32-next/alsa-kernel/pci/cmipci.c

Timestamp:

Aug 5, 2022, 4:38:17 AM (3 years ago)

Author:

Paul Smedley

Message:

Update source to 5.15.59

File:

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

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

@@ -308 +308 @@
 #define CM_MICGAINZ_SHIFT       0
 
-#define CM_REG_MIXER3           0x24
 #define CM_REG_AUX_VOL          0x26
 #define CM_VAUXL_MASK           0xf0
@@ -3280 +3279 @@
         err = snd_cmipci_create(card, pci, dev);
         if (err < 0)
-                return err;
+                goto error;
 
         err = snd_card_register(card);
         if (err < 0)
-                return err;
+                goto error;
 
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
+
+ error:
+        snd_card_free(card);
+        return err;
 }
 
@@ -3297 +3300 @@
 static const unsigned char saved_regs[] = {
         CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,
-        CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL,
+        CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_AUX_VOL, CM_REG_PLL,
         CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2,
         CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,