From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 21 Jan 2013 14:35:12 +0000 (-0800)
Subject: Merge tag 'ux500-dma40' of //git.linaro.org/people/fabiobaltieri/linux.git
X-Git-Tag: v3.9-rc1~80^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c5e6a3990ce64192b56ffafa5ffa5af129751d5;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'ux500-dma40' of //git.linaro.org/people/fabiobaltieri/linux.git

Pull ste_dma40 fixes from Fabio

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

6c5e6a3990ce64192b56ffafa5ffa5af129751d5
diff --cc drivers/dma/ste_dma40.c
index e5e60bb68d9df,d77d41d7c463e..ad860a221c333
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@@ -2330,14 -2526,12 +2526,12 @@@ d40_prep_memcpy_sg(struct dma_chan *cha
  	return d40_prep_sg(chan, src_sg, dst_sg, src_nents, DMA_NONE, dma_flags);
  }
  
- static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan,
- 							 struct scatterlist *sgl,
- 							 unsigned int sg_len,
- 							 enum dma_transfer_direction direction,
- 							 unsigned long dma_flags,
- 							 void *context)
+ static struct dma_async_tx_descriptor *
+ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
+ 		  unsigned int sg_len, enum dma_transfer_direction direction,
+ 		  unsigned long dma_flags, void *context)
  {
 -	if (direction != DMA_DEV_TO_MEM && direction != DMA_MEM_TO_DEV)
 +	if (!is_slave_direction(direction))
  		return NULL;
  
  	return d40_prep_sg(chan, sgl, sgl, sg_len, direction, dma_flags);