Merge branch 'for-rmk' of git://git.marvell.com/orion into devel

[karo-tx-linux.git] / sound / core / control_compat.c

diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 6101259ad860e1b05260f36faa42758944ebc088..368dc9c4aef8d905eff9eb4fb780abedf53fca04 100644 (file)
--- 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: