X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fsparc%2Fcs4231.c;h=791d2fb821d17b40495a1cdfc127016752ba6790;hb=5e246b850df563224be26f1d409cf66fd6c968df;hp=f8c7a120ccbb3ce2c98821523c55223fcbbb3458;hpb=2024da603978882d102a34d47828a205fffb338e;p=linux-2.6-omap-h63xx.git

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f8c7a120ccb..791d2fb821d 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -19,7 +19,6 @@
 #include <linux/io.h>
 
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/info.h>
@@ -1561,7 +1560,8 @@ static int __init snd_cs4231_mixer(struct snd_card *card)
 	struct snd_cs4231 *chip = card->private_data;
 	int err, idx;
 
-	snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
+	if (snd_BUG_ON(!chip || !chip->pcm))
+		return -EINVAL;
 
 	strcpy(card->mixername, chip->pcm->name);