Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index f96f92f00f92..dec2419b9456 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -287,7 +287,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
                 sg_dma_len(sg)          = new_size;
 
                 txd = ichan->dma_chan.device->device_prep_slave_sg(
-                        &ichan->dma_chan, sg, 1, DMA_FROM_DEVICE,
+                        &ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM,
                         DMA_PREP_INTERRUPT);
                 if (!txd)
                         goto error;
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index a0895bf07487..6876f7e471da 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -565,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
         spin_unlock_irq(&fh->queue_lock);
 
         desc = fh->chan->device->device_prep_slave_sg(fh->chan,
-                buf->sg, sg_elems, DMA_FROM_DEVICE,
+                buf->sg, sg_elems, DMA_DEV_TO_MEM,
                 DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
         if (!desc) {
                 spin_lock_irq(&fh->queue_lock);