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

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

@@ -438 +438 @@
         
         spin_lock_irqsave(&emu->fx8010.irq_lock, flags);
-        if ((tmp = emu->fx8010.irq_handlers) == irq) {
+        tmp = emu->fx8010.irq_handlers;
+        if (tmp == irq) {
                 emu->fx8010.irq_handlers = tmp->next;
                 if (emu->fx8010.irq_handlers == NULL) {
@@ -873 +874 @@
                         knew.private_value = (unsigned long)ctl;
                         *ctl = *nctl;
-                        if ((err = snd_ctl_add(emu->card, kctl = snd_ctl_new1(&knew, emu))) < 0) {
+                        kctl = snd_ctl_new1(&knew, emu);
+                        err = snd_ctl_add(emu->card, kctl);
+                        if (err < 0) {
                                 kfree(ctl);
                                 kfree(knew.tlv.p);
@@ -2405 +2408 @@
                 OP(icode, &ptr, iACC3, C_00000000, C_00000000, C_00000000, C_00000000);
 
-        if ((err = snd_emu10k1_fx8010_tram_setup(emu, ipcm->buffer_size)) < 0)
+        err = snd_emu10k1_fx8010_tram_setup(emu, ipcm->buffer_size);
+        if (err < 0)
                 goto __err;
         icode->gpr_add_control_count = i;
@@ -2683 +2687 @@
         int err;
         
-        if ((err = snd_hwdep_new(emu->card, "FX8010", device, &hw)) < 0)
+        err = snd_hwdep_new(emu->card, "FX8010", device, &hw);
+        if (err < 0)
                 return err;
         strcpy(hw->name, "EMU10K1 (FX8010)");