Pull misc-2.6.40 into release branch

[mv-sheeva.git] / drivers / dma / dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 90ea08a53d626b393e11e5d624737f96b5336fcd..9c25c7d099e494be5ddee2bed8276932c9a2e7eb 100644 (file)
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -36,8 +36,8 @@
                struct dw_dma_slave *__slave = (private);       \
                int dms = __slave ? __slave->dst_master : 0;    \
                int sms = __slave ? __slave->src_master : 1;    \
-               u8 smsize = __slave ? __slave->src_msize : 0;   \
-               u8 dmsize = __slave ? __slave->dst_msize : 0;   \
+               u8 smsize = __slave ? __slave->src_msize : DW_DMA_MSIZE_16; \
+               u8 dmsize = __slave ? __slave->dst_msize : DW_DMA_MSIZE_16; \
                                                                \
                (DWC_CTLL_DST_MSIZE(dmsize)                     \
                 | DWC_CTLL_SRC_MSIZE(smsize)                   \