1 files changed, 12 insertions, 6 deletions

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 491a4a50f869..5ff4dbb62dad 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1319,7 +1319,8 @@ static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
         unsigned long flags;
         
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
         midi->substream_input = substream;
@@ -1345,7 +1346,8 @@ static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
         midi->substream_output = substream;
@@ -1372,7 +1374,8 @@ static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1x_intr_disable(emu, midi->rx_enable);
         midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
@@ -1394,7 +1397,8 @@ static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substrea
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1x_intr_disable(emu, midi->tx_enable);
         midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
@@ -1413,7 +1417,8 @@ static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substr
         struct emu10k1x *emu;
         struct emu10k1x_midi *midi = substream->rmidi->private_data;
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up)
                 snd_emu10k1x_intr_enable(emu, midi->rx_enable);
@@ -1428,7 +1433,8 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up) {
                 int max = 4;