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

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

@@ -77 +77 @@
                 return err;
 
-        if ((err = snd_trident_create(card, pci,
-                                      pcm_channels[dev],
-                                      ((pci->vendor << 16) | pci->device) == TRIDENT_DEVICE_ID_SI7018 ? 1 : 2,
-                                      wavetable_size[dev],
-                                      &trident)) < 0) {
+        err = snd_trident_create(card, pci,
+                                 pcm_channels[dev],
+                                 ((pci->vendor << 16) | pci->device) == TRIDENT_DEVICE_ID_SI7018 ? 1 : 2,
+                                 wavetable_size[dev],
+                                 &trident);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -110 +111 @@
                 card->shortname, trident->port, trident->irq);
 
-        if ((err = snd_trident_pcm(trident, pcm_dev++)) < 0) {
+        err = snd_trident_pcm(trident, pcm_dev++);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -117 +119 @@
         case TRIDENT_DEVICE_ID_DX:
         case TRIDENT_DEVICE_ID_NX:
-                if ((err = snd_trident_foldback_pcm(trident, pcm_dev++)) < 0) {
+                err = snd_trident_foldback_pcm(trident, pcm_dev++);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
@@ -124 +127 @@
         }
         if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device == TRIDENT_DEVICE_ID_SI7018) {
-                if ((err = snd_trident_spdif_pcm(trident, pcm_dev++)) < 0) {
+                err = snd_trident_spdif_pcm(trident, pcm_dev++);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
         }
-        if (trident->device != TRIDENT_DEVICE_ID_SI7018 &&
-            (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
-                                       trident->midi_port,
-                                       MPU401_INFO_INTEGRATED |
-                                       MPU401_INFO_IRQ_HOOK,
-                                       -1, &trident->rmidi)) < 0) {
-                snd_card_free(card);
-                return err;
+        if (trident->device != TRIDENT_DEVICE_ID_SI7018) {
+                err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
+                                          trident->midi_port,
+                                          MPU401_INFO_INTEGRATED |
+                                          MPU401_INFO_IRQ_HOOK,
+                                          -1, &trident->rmidi);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
         }
 
         snd_trident_create_gameport(trident);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;