tree 52162aff3ff31b35e7abeb72760e93a75076a5cd
parent f442e8b0eae4fbb6bbf9b8b005002b51a59e23bf
author Takashi Iwai <[EMAIL PROTECTED]> Wed, 24 Aug 2005 17:57:25 +0200
committer Jaroslav Kysela <[EMAIL PROTECTED]> Tue, 30 Aug 2005 08:47:31 +0200

[ALSA] Fix missing spin_unlock

au88x0 driver,Common EMU synth
Fixed missing spin_unlock.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>

 sound/pci/au88x0/au88x0_pcm.c |    4 +++-
 sound/synth/emux/emux_synth.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -220,8 +220,10 @@ snd_vortex_pcm_hw_params(snd_pcm_substre
                    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. */
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c
--- a/sound/synth/emux/emux_synth.c
+++ b/sound/synth/emux/emux_synth.c
@@ -98,7 +98,6 @@ snd_emux_note_on(void *p, int note, int 
                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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to