Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memor...

[mv-sheeva.git] / sound / pcmcia / vx / vxp_ops.c

diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index 157b0b539f39d33cfc3b8f7bce35b1c288649bd6..989e04abb5209ca796fd92606b24fa63e573afaa 100644 (file)
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -151,7 +151,7 @@ static int vxp_load_xilinx_binary(struct vx_core *_chip, const struct firmware *
        unsigned int i;
        int c;
        int regCSUER, regRUER;
-       unsigned char *image;
+       const unsigned char *image;
        unsigned char data;
 
        /* Switch to programmation mode */
@@ -408,7 +408,8 @@ static void vxp_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime,
        int offset = pipe->hw_ptr;
        unsigned short *addr = (unsigned short *)(runtime->dma_area + offset);
 
-       snd_assert(count % 2 == 0, return);
+       if (snd_BUG_ON(count % 2))
+               return;
        vx_setup_pseudo_dma(chip, 0);
        if (offset + count > pipe->buffer_bytes) {
                int length = pipe->buffer_bytes - offset;