diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 13:24:38 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 13:24:57 +0400 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /drivers/media/video/timblogiw.c | |
| parent | ca7fe2db892dcf91b2c72ee352eda4ff867903a7 (diff) | |
| parent | 55ba4e5ed4ac57b60fe56acfd324f6a87123cc34 (diff) | |
| download | linux-e0d23ef29ed637dc6bd739f590985746d9ad9caa.tar.xz | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'drivers/media/video/timblogiw.c')
| -rw-r--r-- | drivers/media/video/timblogiw.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |