Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[~andy/linux] / sound / drivers / vx / vx_mixer.c

diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c
index 5a347321f8c037a384a310f696674daa06c7b118..c71b8d148d7fa82324a18863da0b98459488582a 100644 (file)
--- a/sound/drivers/vx/vx_mixer.c
+++ b/sound/drivers/vx/vx_mixer.c
@@ -34,7 +34,8 @@ static void vx_write_codec_reg(struct vx_core *chip, int codec, unsigned int dat
 {
        unsigned long flags;
 
-       snd_assert(chip->ops->write_codec, return);
+       if (snd_BUG_ON(!chip->ops->write_codec))
+               return;
 
        if (chip->chip_status & VX_STAT_IS_STALE)
                return;