ALSA: Kill snd_assert() in sound/isa/*

[linux-2.6-omap-h63xx.git] / sound / isa / gus / gus_mixer.c

diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c
index a96253e16654b21d4dfb7c513d35043fd81907b4..0dd43414016e8236a968d0af181563288f833ba5 100644 (file)
--- a/sound/isa/gus/gus_mixer.c
+++ b/sound/isa/gus/gus_mixer.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/time.h>
 #include <linux/wait.h>
 #include <sound/core.h>
@@ -162,9 +161,11 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus)
        unsigned int idx, max;
        int err;
 
-       snd_assert(gus != NULL, return -EINVAL);
+       if (snd_BUG_ON(!gus))
+               return -EINVAL;
        card = gus->card;
-       snd_assert(card != NULL, return -EINVAL);
+       if (snd_BUG_ON(!card))
+               return -EINVAL;
 
        if (gus->ics_flag)
                snd_component_add(card, "ICS2101");