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

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

@@ -148 +148 @@
         };
 
-        if ((err = snd_ac97_bus(card, 0, &ops, NULL, &pbus)) < 0)
+        err = snd_ac97_bus(card, 0, &ops, NULL, &pbus);
+        if (err < 0)
                 return err;
 
@@ -160 +161 @@
         olpc_prequirks(card, &ac97);
 
-        if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
+        err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97);
+        if (err < 0) {
                 dev_err(card->dev, "mixer failed\n");
                 return err;
@@ -271 +273 @@
 
         *rcs5535au = NULL;
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -291 +294 @@
         cs5535au->irq = -1;
 
-        if ((err = pci_request_regions(pci, "CS5535 Audio")) < 0) {
+        err = pci_request_regions(pci, "CS5535 Audio");
+        if (err < 0) {
                 kfree(cs5535au);
                 goto pcifail;
@@ -309 +313 @@
         pci_set_master(pci);
 
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
-                                  cs5535au, &ops)) < 0)
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cs5535au, &ops);
+        if (err < 0)
                 goto sndfail;
 
@@ -345 +349 @@
                 return err;
 
-        if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
+        err = snd_cs5535audio_create(card, pci, &cs5535au);
+        if (err < 0)
                 goto probefail_out;
 
         card->private_data = cs5535au;
 
-        if ((err = snd_cs5535audio_mixer(cs5535au)) < 0)
+        err = snd_cs5535audio_mixer(cs5535au);
+        if (err < 0)
                 goto probefail_out;
 
-        if ((err = snd_cs5535audio_pcm(cs5535au)) < 0)
+        err = snd_cs5535audio_pcm(cs5535au);
+        if (err < 0)
                 goto probefail_out;
 
@@ -363 +370 @@
                 cs5535au->port, cs5535au->irq);
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto probefail_out;