Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / drivers / dma / imx-dma.c

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index e18eaab..d99f71c 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -135,7 +135,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                if (ret)
                        return ret;
 
-               imx_dma_config_burstlen(imxdmac->imxdma_channel, imxdmac->watermark_level);
+               imx_dma_config_burstlen(imxdmac->imxdma_channel,
+                               imxdmac->watermark_level * imxdmac->word_size);
 
                return 0;
        default: