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

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

@@ -320 +320 @@
         int err;
 
-        if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
+        err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi);
+        if (err < 0)
                 return err;
         midi->emu = emu;
@@ -343 +344 @@
         int err;
 
-        if ((err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)")) < 0)
+        err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)");
+        if (err < 0)
                 return err;
 
@@ -361 +363 @@
 
         midi = &emu->midi;
-        if ((err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)")) < 0)
+        err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)");
+        if (err < 0)
                 return err;
 
@@ -372 +375 @@
 
         midi = &emu->midi2;
-        if ((err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2")) < 0)
+        err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2");
+        if (err < 0)
                 return err;