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

[sfrench/cifs-2.6.git] / sound / drivers / vx / vx_cmd.c

diff --git a/sound/drivers/vx/vx_cmd.c b/sound/drivers/vx/vx_cmd.c
index 9529e3bf2866309f808488e5ba46ac1732c6d684..23f4857f02c888d994292354d1b6b89303bf43c6 100644 (file)
--- a/sound/drivers/vx/vx_cmd.c
+++ b/sound/drivers/vx/vx_cmd.c
@@ -99,7 +99,8 @@ static struct vx_cmd_info vx_dsp_cmds[] = {
  */
 void vx_init_rmh(struct vx_rmh *rmh, unsigned int cmd)
 {
-       snd_assert(cmd < CMD_LAST_INDEX, return);
+       if (snd_BUG_ON(cmd >= CMD_LAST_INDEX))
+               return;
        rmh->LgCmd = vx_dsp_cmds[cmd].length;
        rmh->LgStat = vx_dsp_cmds[cmd].st_length;
        rmh->DspStat = vx_dsp_cmds[cmd].st_type;