Changeset 689 for GPL/trunk/alsa-kernel/isa

Timestamp:

Jul 24, 2021, 3:42:01 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge in changes from uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/gus/gus_main.c (modified) (1 diff)
• alsa-kernel/isa/sb/emu8000.c (modified) (1 diff)
• alsa-kernel/isa/sb/sb16_csp.c (modified) (1 diff)
• alsa-kernel/isa/sb/sb16_main.c (modified) (1 diff)
• alsa-kernel/isa/sb/sb8.c (modified) (1 diff)

GPL/trunk/alsa-kernel/isa/gus/gus_main.c

@@ -78 +78 @@
 static void snd_gus_init_control(struct snd_gus_card *gus)
 {
-        int ret;
-
-        if (!gus->ace_flag) {
-                ret =
-                        snd_ctl_add(gus->card,
-                                        snd_ctl_new1(&snd_gus_joystick_control,
-                                                gus));
-                if (ret)
-                        snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n",
-                                        ret);
-        }
+        if (!gus->ace_flag)
+                snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
 }
 

GPL/trunk/alsa-kernel/isa/sb/emu8000.c

@@ -1030 +1030 @@
         memset(emu->controls, 0, sizeof(emu->controls));
         for (i = 0; i < EMU8000_NUM_CONTROLS; i++) {
-                if ((err = snd_ctl_add(card, emu->controls[i] = snd_ctl_new1(mixer_defs[i], emu))) < 0)
+                if ((err = snd_ctl_add(card, emu->controls[i] = snd_ctl_new1(mixer_defs[i], emu))) < 0) {
+                        emu->controls[i] = NULL;
                         goto __error;
+                }
         }
         return 0;

GPL/trunk/alsa-kernel/isa/sb/sb16_csp.c

@@ -1047 +1047 @@
         spin_lock_init(&p->q_lock);
 
-        if ((err = snd_ctl_add(card, p->qsound_switch = snd_ctl_new1(&snd_sb_qsound_switch, p))) < 0)
+        if ((err = snd_ctl_add(card, p->qsound_switch = snd_ctl_new1(&snd_sb_qsound_switch, p))) < 0) {
+                p->qsound_switch = NULL;
                 goto __error;
-        if ((err = snd_ctl_add(card, p->qsound_space = snd_ctl_new1(&snd_sb_qsound_space, p))) < 0)
+        }
+        if ((err = snd_ctl_add(card, p->qsound_space = snd_ctl_new1(&snd_sb_qsound_space, p))) < 0) {
+                p->qsound_space = NULL;
                 goto __error;
+        }
 
         return 0;

GPL/trunk/alsa-kernel/isa/sb/sb16_main.c

@@ -847 +847 @@
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
 
-        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
-                err = snd_ctl_add(card, snd_ctl_new1(
-                                        &snd_sb16_dma_control, chip));
-                if (err)
-                        return err;
-        } else {
+        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16)
+                snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
+        else
                 pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
-        }
 
         snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

GPL/trunk/alsa-kernel/isa/sb/sb8.c

@@ -97 +97 @@
         /* block the 0x388 port to avoid PnP conflicts */
         acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
-        if (!acard->fm_res) {
-                err = -EBUSY;
-                goto _err;
-        }
 
         if (port[dev] != SNDRV_AUTO_PORT) {