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

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

@@ -195 +195 @@
         /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
         channel->epcm = epcm;
-        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+        err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        if (err < 0)
                 return err;
 
@@ -243 +244 @@
         /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
         channel->epcm = epcm;
-        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+        err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        if (err < 0)
                 return err;
 
@@ -590 +592 @@
         emu->p16v_device_offset = device;
 
-        if ((err = snd_pcm_new(emu->card, "p16v", device, 1, capture, &pcm)) < 0)
+        err = snd_pcm_new(emu->card, "p16v", device, 1, capture, &pcm);
+        if (err < 0)
                 return err;
   
@@ -809 +812 @@
 
         for (i = 0; i < ARRAY_SIZE(p16v_mixer_controls); i++) {
-                if ((err = snd_ctl_add(card, snd_ctl_new1(&p16v_mixer_controls[i],
-                                                          emu))) < 0)
+                err = snd_ctl_add(card, snd_ctl_new1(&p16v_mixer_controls[i], emu));
+                if (err < 0)
                         return err;
         }