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

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

@@ -853 +853 @@
         *rchip = NULL;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -864 +865 @@
 
         /* allocate chip specific data with zero-filled memory */
-        if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip) {
                 pci_disable_device(pci);
                 return -ENOMEM;
@@ -875 +877 @@
 
         /* (1) PCI resource allocation */
-        if ((err = pci_request_regions(pci, card->driver)) < 0)
+        err = pci_request_regions(pci, card->driver);
+        if (err < 0)
                 goto free_and_ret;
 
@@ -901 +904 @@
 
         /* (2) initialization of the chip hardware */
-        if ((err = snd_ad1889_init(chip)) < 0) {
+        err = snd_ad1889_init(chip);
+        if (err < 0) {
                 snd_ad1889_free(chip);
                 return err;
         }
 
-        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_ad1889_free(chip);
                 return err;