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>

diff --cc drivers/dma/ste_dma40.c
index e5e60bb,d77d41d..ad860a2
--- 1/drivers/dma/ste_dma40.c
--- 2/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);