git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
mx3_camera.c
diff --git
a/drivers/media/video/mx3_camera.c
b/drivers/media/video/mx3_camera.c
index 0cb461dd396af39ffbff65b387fdae11742d4ebf..74522773e934c18e417f36b36aed40017b35e02f 100644
(file)
--- 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;