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

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx.c

@@ -78 +78 @@
         if (err < 0)
                 return err;
-        if ((err = snd_cs46xx_create(card, pci,
-                                     external_amp[dev], thinkpad[dev],
-                                     &chip)) < 0) {
+        err = snd_cs46xx_create(card, pci,
+                                external_amp[dev], thinkpad[dev],
+                                &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -86 +87 @@
         card->private_data = chip;
         chip->accept_valid = mmap_valid[dev];
-        if ((err = snd_cs46xx_pcm(chip, 0)) < 0) {
+        err = snd_cs46xx_pcm(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        if ((err = snd_cs46xx_pcm_rear(chip, 1)) < 0) {
+        err = snd_cs46xx_pcm_rear(chip, 1);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_cs46xx_pcm_iec958(chip, 2)) < 0) {
+        err = snd_cs46xx_pcm_iec958(chip, 2);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 #endif
-        if ((err = snd_cs46xx_mixer(chip, 2)) < 0) {
+        err = snd_cs46xx_mixer(chip, 2);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -106 +111 @@
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         if (chip->nr_ac97_codecs ==2) {
-                if ((err = snd_cs46xx_pcm_center_lfe(chip, 3)) < 0) {
+                err = snd_cs46xx_pcm_center_lfe(chip, 3);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
@@ -112 +118 @@
         }
 #endif
-        if ((err = snd_cs46xx_midi(chip, 0)) < 0) {
+        err = snd_cs46xx_midi(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_cs46xx_start_dsp(chip)) < 0) {
+        err = snd_cs46xx_start_dsp(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -132 +140 @@
                 chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;