X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fisa%2Fes1688%2Fes1688_lib.c;h=4fbb508a817f39485406800431c87fc7130c8450;hb=622207dc31895b4e82c39100db8635d885c795e2;hp=1e1e575b1db329f87b289cb4cc57bbb954f1bae0;hpb=7eaa943c8ed8e91e05d0f5d0dc7a18e3319b45cf;p=linux-2.6-omap-h63xx.git

diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 1e1e575b1db..4fbb508a817 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -1009,7 +1009,8 @@ int snd_es1688_mixer(struct snd_es1688 *chip)
 	int err;
 	unsigned char reg, val;
 
-	snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+	if (snd_BUG_ON(!chip || !chip->card))
+		return -EINVAL;
 
 	card = chip->card;