X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=sound%2Fcore%2Fcontrol_compat.c;h=368dc9c4aef8d905eff9eb4fb780abedf53fca04;hb=c94260bcd4db3b7bad0b115a0c8d917a47c4733d;hp=6101259ad860e1b05260f36faa42758944ebc088;hpb=c64768a7d671bcde80bca2aed93f9e07edc069c3;p=linux-2.6-omap-h63xx.git

diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 6101259ad86..368dc9c4aef 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -398,7 +398,8 @@ static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns
 	int err;
 
 	ctl = file->private_data;
-	snd_assert(ctl && ctl->card, return -ENXIO);
+	if (snd_BUG_ON(!ctl || !ctl->card))
+		return -ENXIO;
 
 	switch (cmd) {
 	case SNDRV_CTL_IOCTL_PVERSION: