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

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

@@ -299 +299 @@
         };
 
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus);
+        if (err < 0)
                 return err;
 
@@ -622 +623 @@
         *rchip = NULL;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -644 +646 @@
         spin_lock_init(&chip->reg_lock);
 
-        if ((err = pci_request_regions(pci, "ALS300")) < 0) {
+        err = pci_request_regions(pci, "ALS300");
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -674 +677 @@
         }
 
-        if ((err = snd_als300_new_pcm(chip)) < 0) {
+        err = snd_als300_new_pcm(chip);
+        if (err < 0) {
                 dev_err(card->dev, "Could not create PCM\n");
                 snd_als300_free(chip);
@@ -680 +684 @@
         }
 
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
-                                                chip, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0) {
                 snd_als300_free(chip);
                 return err;
@@ -742 +746 @@
         chip_type = pci_id->driver_data;
 
-        if ((err = snd_als300_create(card, pci, chip_type, &chip)) < 0) {
+        err = snd_als300_create(card, pci, chip_type, &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -759 +764 @@
                                 card->shortname, chip->port, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;