Merge commit 'origin'

[linux-2.6-omap-h63xx.git] / sound / drivers / vx / vx_mixer.c

diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c
index a37f0a8f17af46a9b4e3d545ca136b33aee04cd8..c71b8d148d7fa82324a18863da0b98459488582a 100644 (file)
--- a/sound/drivers/vx/vx_mixer.c
+++ b/sound/drivers/vx/vx_mixer.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/tlv.h>
@@ -35,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;