]> err.no Git - linux-2.6/commitdiff
[ALSA] Fix missing spin_unlock
authorTakashi Iwai <tiwai@suse.de>
Wed, 24 Aug 2005 15:57:25 +0000 (17:57 +0200)
committerJaroslav Kysela <perex@suse.cz>
Tue, 30 Aug 2005 06:47:31 +0000 (08:47 +0200)
au88x0 driver,Common EMU synth
Fixed missing spin_unlock.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/au88x0/au88x0_pcm.c
sound/synth/emux/emux_synth.c

index de95bd6d1ee185b74bbd14f30740cffd926cc998..38bd2b5dd434a00c63b4a6dcdfe6c9124bc77c91 100644 (file)
@@ -220,8 +220,10 @@ snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
                    vortex_adb_allocroute(chip, -1,
                                          params_channels(hw_params),
                                          substream->stream, type);
-               if (dma < 0)
+               if (dma < 0) {
+                       spin_unlock_irq(&chip->lock);
                        return dma;
+               }
                stream = substream->runtime->private_data = &chip->dma_adb[dma];
                stream->substream = substream;
                /* Setup Buffers. */
index f13b038329ebfb29d5fad6728252484f162cb072..751bf1272af3bc77917d5ba3f66427ca76cdd09a 100644 (file)
@@ -98,7 +98,6 @@ snd_emux_note_on(void *p, int note, int vel, snd_midi_channel_t *chan)
                vp = emu->ops.get_voice(emu, port);
                if (vp == NULL || vp->ch < 0)
                        continue;
-               snd_assert(vp->emu != NULL && vp->hw != NULL, return);
                if (STATE_IS_PLAYING(vp->state))
                        emu->ops.terminate(vp);