diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 14:54:38 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 14:54:57 +0530 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /drivers/usb/musb | |
| parent | ca7fe2db892dcf91b2c72ee352eda4ff867903a7 (diff) | |
| parent | 55ba4e5ed4ac57b60fe56acfd324f6a87123cc34 (diff) | |
| download | blackbird-op-linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.gz blackbird-op-linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.zip | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/ux500_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index ef4333f4bbe0..f8fd0ddee14a 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -112,7 +112,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, struct musb_hw_ep *hw_ep = ux500_channel->hw_ep; struct dma_chan *dma_chan = ux500_channel->dma_chan; struct dma_async_tx_descriptor *dma_desc; - enum dma_data_direction direction; + enum dma_transfer_direction direction; struct scatterlist sg; struct dma_slave_config slave_conf; enum dma_slave_buswidth addr_width; @@ -132,7 +132,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, sg_dma_address(&sg) = dma_addr; sg_dma_len(&sg) = len; - direction = ux500_channel->is_tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE; + direction = ux500_channel->is_tx ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; addr_width = (len & 0x3) ? DMA_SLAVE_BUSWIDTH_1_BYTE : DMA_SLAVE_BUSWIDTH_4_BYTES; |
