diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 10:24:38 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 10:24:57 +0100 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /drivers/media/video/mx3_camera.c | |
| parent | pch_dma: Support new device LAPIS Semiconductor ML7831 IOH (diff) | |
| parent | USB-renesas: move to dma_transfer_direction (diff) | |
| download | linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.xz linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.zip | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
| -rw-r--r-- | drivers/media/video/mx3_camera.c | 2 |
1 files changed, 1 insertions, 1 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; |