Changeset 703 for GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1.c

Timestamp:

Sep 26, 2021, 6:18:40 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emu10k1.c (modified) (3 diffs)

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

@@ -122 +122 @@
         else if (max_buffer_size[dev] > 1024)
                 max_buffer_size[dev] = 1024;
-        if ((err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],
-                                      (long)max_buffer_size[dev] * 1024 * 1024,
-                                      enable_ir[dev], subsystem[dev],
-                                      &emu)) < 0)
+        err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],
+                                 (long)max_buffer_size[dev] * 1024 * 1024,
+                                 enable_ir[dev], subsystem[dev],
+                                 &emu);
+        if (err < 0)
                 goto error;
         card->private_data = emu;
         emu->delay_pcm_irq = delay_pcm_irq[dev] & 0x1f;
-        if ((err = snd_emu10k1_pcm(emu, 0)) < 0)
-                goto error;
-        if ((err = snd_emu10k1_pcm_mic(emu, 1)) < 0)
-                goto error;
-        if ((err = snd_emu10k1_pcm_efx(emu, 2)) < 0)
+        err = snd_emu10k1_pcm(emu, 0);
+        if (err < 0)
+                goto error;
+        err = snd_emu10k1_pcm_mic(emu, 1);
+        if (err < 0)
+                goto error;
+        err = snd_emu10k1_pcm_efx(emu, 2);
+        if (err < 0)
                 goto error;
         /* This stores the periods table. */
@@ -143 +147 @@
         }
 
-        if ((err = snd_emu10k1_mixer(emu, 0, 3)) < 0)
+        err = snd_emu10k1_mixer(emu, 0, 3);
+        if (err < 0)
                 goto error;
         
-        if ((err = snd_emu10k1_timer(emu, 0)) < 0)
-                goto error;
-
-        if ((err = snd_emu10k1_pcm_multi(emu, 3)) < 0)
+        err = snd_emu10k1_timer(emu, 0);
+        if (err < 0)
+                goto error;
+
+        err = snd_emu10k1_pcm_multi(emu, 3);
+        if (err < 0)
                 goto error;
         if (emu->card_capabilities->ca0151_chip) { /* P16V */
-                if ((err = snd_p16v_pcm(emu, 4)) < 0)
+                err = snd_p16v_pcm(emu, 4);
+                if (err < 0)
                         goto error;
         }
         if (emu->audigy) {
-                if ((err = snd_emu10k1_audigy_midi(emu)) < 0)
+                err = snd_emu10k1_audigy_midi(emu);
+                if (err < 0)
                         goto error;
         } else {
-                if ((err = snd_emu10k1_midi(emu)) < 0)
-                        goto error;
-        }
-        if ((err = snd_emu10k1_fx8010_new(emu, 0)) < 0)
+                err = snd_emu10k1_midi(emu);
+                if (err < 0)
+                        goto error;
+        }
+        err = snd_emu10k1_fx8010_new(emu, 0);
+        if (err < 0)
                 goto error;
 #ifdef ENABLE_SYNTH
@@ -189 +200 @@
                  card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto error;