From 999ba0f89846d3256ced41c5c3d3277fdeee25e3 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 1 Oct 2012 13:06:25 +0300 Subject: [PATCH] --- yaml --- r: 332885 b: refs/heads/master c: 3d4f860583bf4aa55dd5c6d5ba6ccf1f25fb473a h: refs/heads/master i: 332883: c1a8a408ed37e91d69659ae264054d2af1fdcf2b v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4591d2e7bfbf..8ecd6fca5d21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fed2574b3c9f44556ed4f5cb17f63b15edd87d06 +refs/heads/master: 3d4f860583bf4aa55dd5c6d5ba6ccf1f25fb473a diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 9ca9ca41b83e..c4b0eb3cde81 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -716,6 +716,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, size_t offset; unsigned int src_width; unsigned int dst_width; + unsigned int data_width; u32 ctllo; dev_vdbg(chan2dev(chan), @@ -728,11 +729,11 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, return NULL; } - src_width = min_t(unsigned int, dwc->dw->data_width[dwc_get_sms(dws)], - dwc_fast_fls(src | len)); + data_width = min_t(unsigned int, dwc->dw->data_width[dwc_get_sms(dws)], + dwc->dw->data_width[dwc_get_dms(dws)]); - dst_width = min_t(unsigned int, dwc->dw->data_width[dwc_get_dms(dws)], - dwc_fast_fls(dest | len)); + src_width = dst_width = min_t(unsigned int, data_width, + dwc_fast_fls(src | dest | len)); ctllo = DWC_DEFAULT_CTLLO(chan) | DWC_CTLL_DST_WIDTH(dst_width)