Changeset 703 for GPL/trunk/alsa-kernel/pci/ca0106

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/ca0106/ca0106_main.c (modified) (4 diffs)
• alsa-kernel/pci/ca0106/ca_midi.c (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/ca0106/ca0106_main.c

@@ -580 +580 @@
         //channel->interrupt = snd_ca0106_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;
-        if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
+        err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);
+        if (err < 0)
                 return err;
         snd_pcm_set_sync(substream);
@@ -673 +675 @@
         //channel->interrupt = snd_ca0106_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;
         //snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, &hw_constraints_capture_period_sizes);
-        if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
+        err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);
+        if (err < 0)
                 return err;
         return 0;
@@ -1171 +1175 @@
         };
   
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus);
+        if (err < 0)
                 return err;
         pbus->no_vra = 1; /* we don't need VRA */
@@ -1764 +1769 @@
         midi->dev_id = chip;
         
-        if ((err = ca_midi_init(chip, midi, 0, name)) < 0)
+        err = ca_midi_init(chip, midi, 0, name);
+        if (err < 0)
                 return err;
 

GPL/trunk/alsa-kernel/pci/ca0106/ca_midi.c

@@ -277 +277 @@
         int err;
 
-        if ((err = snd_rawmidi_new(midi->get_dev_id_card(midi->dev_id), name, device, 1, 1, &rmidi)) < 0)
+        err = snd_rawmidi_new(midi->get_dev_id_card(midi->dev_id), name, device, 1, 1, &rmidi);
+        if (err < 0)
                 return err;