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

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

@@ -26 +26 @@
         struct snd_emu10k1_pcm *epcm;
 
-        if ((epcm = voice->epcm) == NULL)
+        epcm = voice->epcm;
+        if (!epcm)
                 return;
         if (epcm->substream == NULL)
@@ -400 +401 @@
         int err;
 
-        if ((err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params))) < 0)
+        err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params));
+        if (err < 0)
                 return err;
 
@@ -1125 +1127 @@
         runtime->private_free = snd_emu10k1_pcm_free_substream;
         runtime->hw = snd_emu10k1_playback;
-        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) {
                 kfree(epcm);
                 return err;
         }
-        if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) < 0) {
+        err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX);
+        if (err < 0) {
                 kfree(epcm);
                 return err;
@@ -1381 +1385 @@
         int err;
 
-        if ((err = snd_pcm_new(emu->card, "emu10k1", device, 32, 1, &pcm)) < 0)
+        err = snd_pcm_new(emu->card, "emu10k1", device, 32, 1, &pcm);
+        if (err < 0)
                 return err;
 
@@ -1413 +1418 @@
         int err;
 
-        if ((err = snd_pcm_new(emu->card, "emu10k1", device, 1, 0, &pcm)) < 0)
+        err = snd_pcm_new(emu->card, "emu10k1", device, 1, 0, &pcm);
+        if (err < 0)
                 return err;
 
@@ -1447 +1453 @@
         int err;
 
-        if ((err = snd_pcm_new(emu->card, "emu10k1 mic", device, 0, 1, &pcm)) < 0)
+        err = snd_pcm_new(emu->card, "emu10k1 mic", device, 0, 1, &pcm);
+        if (err < 0)
                 return err;
 
@@ -1775 +1782 @@
         int err;
 
-        if ((err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm)) < 0)
+        err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);
+        if (err < 0)
                 return err;