Changeset 703 for GPL/trunk/alsa-kernel/drivers/mpu401

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/drivers/mpu401/mpu401.c (modified) (3 diffs)
• alsa-kernel/drivers/mpu401/mpu401_uart.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401.c

@@ -117 +117 @@
         if (err < 0)
                 return err;
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -195 +196 @@
                 if (err < 0)
                         return err;
-                if ((err = snd_card_register(card)) < 0) {
+                err = snd_card_register(card);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
@@ -240 +242 @@
         int i, err;
 
-        if ((err = platform_driver_register(&snd_mpu401_driver)) < 0)
+        err = platform_driver_register(&snd_mpu401_driver);
+        if (err < 0)
                 return err;
 

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401_uart.c

@@ -283 +283 @@
 
         mpu = substream->rmidi->private_data;
-        if (mpu->open_input && (err = mpu->open_input(mpu)) < 0)
-                return err;
+        if (mpu->open_input) {
+                err = mpu->open_input(mpu);
+                if (err < 0)
+                        return err;
+        }
         if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode)) {
                 if (snd_mpu401_do_reset(mpu) < 0)
@@ -305 +308 @@
 
         mpu = substream->rmidi->private_data;
-        if (mpu->open_output && (err = mpu->open_output(mpu)) < 0)
-                return err;
+        if (mpu->open_output) {
+                err = mpu->open_output(mpu);
+                if (err < 0)
+                        return err;
+        }
         if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
                 if (snd_mpu401_do_reset(mpu) < 0)
@@ -536 +542 @@
         in_enable = (info_flags & MPU401_INFO_INPUT) ? 1 : 0;
         out_enable = (info_flags & MPU401_INFO_OUTPUT) ? 1 : 0;
-        if ((err = snd_rawmidi_new(card, "MPU-401U", device,
-                                   out_enable, in_enable, &rmidi)) < 0)
+        err = snd_rawmidi_new(card, "MPU-401U", device,
+                              out_enable, in_enable, &rmidi);
+        if (err < 0)
                 return err;
         mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);