ALSA: Kill snd_assert() in other places

[linux-2.6-omap-h63xx.git] / sound / parisc / harmony.c

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index ff705c63a03a2f0292438a380e11b2f76212de22..774372fe34adb02a5d78686044c2de6e6cd59778 100644 (file)
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -45,7 +45,6 @@
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/control.h>
@@ -869,7 +868,8 @@ snd_harmony_mixer_init(struct snd_harmony *h)
        struct snd_card *card = h->card;
        int idx, err;
 
-       snd_assert(h != NULL, return -EINVAL);
+       if (snd_BUG_ON(!h))
+               reutrn -EINVAL;
        strcpy(card->mixername, "Harmony Gain control interface");
 
        for (idx = 0; idx < HARMONY_CONTROLS; idx++) {