X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fparisc%2Fharmony.c;h=41f870f8a11d21390e1caa473326d659274e28fc;hb=d2441183dc222d12961ff2201f5086c846505d93;hp=99f5483abf2e7efb006a01928edb3b64d0dcf886;hpb=70ec75c5b8e0bda7a16fb387f91e08545f379a0e;p=linux-2.6-omap-h63xx.git

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 99f5483abf2..41f870f8a11 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -868,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++) {