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

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

@@ -1323 +1323 @@
                 return -ENOMEM;
 
-        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;
 
@@ -1481 +1482 @@
         *chip_ret = NULL;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -1573 +1575 @@
         else {
                 /* get buffer end pointer from signature */
-                if ((err = snd_nm256_peek_for_sig(chip)) < 0)
+                err = snd_nm256_peek_for_sig(chip);
+                if (err < 0)
                         goto __error;
         }
@@ -1623 +1626 @@
         // pci_set_master(pci); /* needed? */
         
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0)
                 goto __error;
 
@@ -1705 +1709 @@
         if (capture_bufsize > 128)
                 capture_bufsize = 128;
-        if ((err = snd_nm256_create(card, pci, &chip)) < 0) {
+        err = snd_nm256_create(card, pci, &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1721 +1726 @@
         }
 
-        if ((err = snd_nm256_pcm(chip, 0)) < 0 ||
-            (err = snd_nm256_mixer(chip)) < 0) {
+        err = snd_nm256_pcm(chip, 0);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        err = snd_nm256_mixer(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1732 +1742 @@
                 chip->buffer_addr, chip->cport_addr, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;