Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / sound / pci / ca0106 / ca_midi.c

diff --git a/sound/pci/ca0106/ca_midi.c b/sound/pci/ca0106/ca_midi.c
index 2e6eab1f1189153c77ab0d3765afe41574d0ebae..c7885117da334c3da81b41a582f1126f4e4f7489 100644 (file)
--- a/sound/pci/ca0106/ca_midi.c
+++ b/sound/pci/ca0106/ca_midi.c
@@ -6,7 +6,7 @@
  *  Changelog:
  *    Implementation is based on mpu401 and emu10k1x and
  *    tested with ca0106.
- *    mpu401: Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *    mpu401: Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *    emu10k1x: Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
  */
 
 #include <linux/spinlock.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
 
@@ -126,7 +125,8 @@ static int ca_midi_input_open(struct snd_rawmidi_substream *substream)
        struct snd_ca_midi *midi = substream->rmidi->private_data;
        unsigned long flags;
        
-       snd_assert(midi->dev_id, return -ENXIO);
+       if (snd_BUG_ON(!midi->dev_id))
+               return -ENXIO;
        spin_lock_irqsave(&midi->open_lock, flags);
        midi->midi_mode |= CA_MIDI_MODE_INPUT;
        midi->substream_input = substream;
@@ -145,7 +145,8 @@ static int ca_midi_output_open(struct snd_rawmidi_substream *substream)
        struct snd_ca_midi *midi = substream->rmidi->private_data;
        unsigned long flags;
 
-       snd_assert(midi->dev_id, return -ENXIO);
+       if (snd_BUG_ON(!midi->dev_id))
+               return -ENXIO;
        spin_lock_irqsave(&midi->open_lock, flags);
        midi->midi_mode |= CA_MIDI_MODE_OUTPUT;
        midi->substream_output = substream;
@@ -164,7 +165,8 @@ static int ca_midi_input_close(struct snd_rawmidi_substream *substream)
        struct snd_ca_midi *midi = substream->rmidi->private_data;
        unsigned long flags;
 
-       snd_assert(midi->dev_id, return -ENXIO);
+       if (snd_BUG_ON(!midi->dev_id))
+               return -ENXIO;
        spin_lock_irqsave(&midi->open_lock, flags);
        midi->interrupt_disable(midi,midi->rx_enable);
        midi->midi_mode &= ~CA_MIDI_MODE_INPUT;
@@ -182,7 +184,9 @@ static int ca_midi_output_close(struct snd_rawmidi_substream *substream)
 {
        struct snd_ca_midi *midi = substream->rmidi->private_data;
        unsigned long flags;
-       snd_assert(midi->dev_id, return -ENXIO);
+
+       if (snd_BUG_ON(!midi->dev_id))
+               return -ENXIO;
        
        spin_lock_irqsave(&midi->open_lock, flags);
 
@@ -202,7 +206,9 @@ static int ca_midi_output_close(struct snd_rawmidi_substream *substream)
 static void ca_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
 {
        struct snd_ca_midi *midi = substream->rmidi->private_data;
-       snd_assert(midi->dev_id, return);
+
+       if (snd_BUG_ON(!midi->dev_id))
+               return;
 
        if (up) {
                midi->interrupt_enable(midi,midi->rx_enable);
@@ -216,7 +222,8 @@ static void ca_midi_output_trigger(struct snd_rawmidi_substream *substream, int
        struct snd_ca_midi *midi = substream->rmidi->private_data;
        unsigned long flags;
 
-       snd_assert(midi->dev_id, return);
+       if (snd_BUG_ON(!midi->dev_id))
+               return;
 
        if (up) {
                int max = 4;