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

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

@@ -385 +385 @@
         *ak4531 = *_ak4531;
         mutex_init(&ak4531->reg_mutex);
-        if ((err = snd_component_add(card, "AK4531")) < 0) {
+        err = snd_component_add(card, "AK4531");
+        if (err < 0) {
                 snd_ak4531_free(ak4531);
                 return err;
@@ -399 +400 @@
         }
         for (idx = 0; idx < ARRAY_SIZE(snd_ak4531_controls); idx++) {
-                if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_ak4531_controls[idx], ak4531))) < 0) {
+                err = snd_ctl_add(card, snd_ctl_new1(&snd_ak4531_controls[idx], ak4531));
+                if (err < 0) {
                         snd_ak4531_free(ak4531);
                         return err;
@@ -405 +407 @@
         }
         snd_ak4531_proc_init(card, ak4531);
-        if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &ops);
+        if (err < 0) {
                 snd_ak4531_free(ak4531);
                 return err;