git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
staging
/
media
/
as102
/
as102_usb_drv.c
diff --git
a/drivers/staging/media/as102/as102_usb_drv.c
b/drivers/staging/media/as102/as102_usb_drv.c
index
264be2d
..
bb64201
100644
(file)
--- a/
drivers/staging/media/as102/as102_usb_drv.c
+++ b/
drivers/staging/media/as102/as102_usb_drv.c
@@
-268,6
+268,8
@@
static int as102_alloc_usb_stream_buffer(struct as102_dev_t *dev)
}
urb->transfer_buffer = dev->stream + (i * AS102_USB_BUF_SIZE);
}
urb->transfer_buffer = dev->stream + (i * AS102_USB_BUF_SIZE);
+ urb->transfer_dma = dev->dma_addr + (i * AS102_USB_BUF_SIZE);
+ urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
urb->transfer_buffer_length = AS102_USB_BUF_SIZE;
dev->stream_urb[i] = urb;
urb->transfer_buffer_length = AS102_USB_BUF_SIZE;
dev->stream_urb[i] = urb;