X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fparisc%2Fharmony.c;h=41f870f8a11d21390e1caa473326d659274e28fc;hb=9def255631bb742264d334d77819e1ae5278a515;hp=ff705c63a03a2f0292438a380e11b2f76212de22;hpb=0ce3c83a9c22f59937b86c80b478dfbffe54dbab;p=linux-2.6-omap-h63xx.git

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index ff705c63a03..41f870f8a11 100644
--- 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))
+		return -EINVAL;
 	strcpy(card->mixername, "Harmony Gain control interface");
 
 	for (idx = 0; idx < HARMONY_CONTROLS; idx++) {