X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fparisc%2Fharmony.c;h=774372fe34adb02a5d78686044c2de6e6cd59778;hb=5e246b850df563224be26f1d409cf66fd6c968df;hp=99f5483abf2e7efb006a01928edb3b64d0dcf886;hpb=da3cec35dd3c31d8706db4bf379372ce70d92118;p=linux-2.6-omap-h63xx.git

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 99f5483abf2..774372fe34a 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))
+		reutrn -EINVAL;
 	strcpy(card->mixername, "Harmony Gain control interface");
 
 	for (idx = 0; idx < HARMONY_CONTROLS; idx++) {