Changeset 703 for GPL/trunk/alsa-kernel/pci/maestro3.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/maestro3.c (modified) (4 diffs)

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

@@ -1777 +1777 @@
         int err;
 
-        if ((err = snd_m3_substream_open(chip, subs)) < 0)
+        err = snd_m3_substream_open(chip, subs);
+        if (err < 0)
                 return err;
 
@@ -1801 +1802 @@
         int err;
 
-        if ((err = snd_m3_substream_open(chip, subs)) < 0)
+        err = snd_m3_substream_open(chip, subs);
+        if (err < 0)
                 return err;
 
@@ -2048 +2050 @@
         };
 
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus);
+        if (err < 0)
                 return err;
         
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
-        if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0)
+        err = snd_ac97_mixer(pbus, &ac97, &chip->ac97);
+        if (err < 0)
                 return err;
 
@@ -2654 +2658 @@
                 goto free_chip;
 
-        if ((err = snd_m3_mixer(chip)) < 0)
+        err = snd_m3_mixer(chip);
+        if (err < 0)
                 return err;
 
         for (i = 0; i < chip->num_substreams; i++) {
                 struct m3_dma *s = &chip->substreams[i];
-                if ((err = snd_m3_assp_client_init(chip, s, i)) < 0)
+                err = snd_m3_assp_client_init(chip, s, i);
+                if (err < 0)
                         return err;
         }
 
-        if ((err = snd_m3_pcm(chip, 0)) < 0)
+        err = snd_m3_pcm(chip, 0);
+        if (err < 0)
                 return err;