summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorHans Verkuil2018-05-30 08:46:22 +0200
committerMauro Carvalho Chehab2018-08-31 17:19:30 +0200
commit394dc588809158826e2877adb670391829f91c63 (patch)
tree0d8efd884d299507f54d857640cb5ebfa8c72d23 /drivers/usb
parentmedia: videobuf2-core: integrate with media requests (diff)
downloadkernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.tar.gz
kernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.tar.xz
kernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.zip
media: videobuf2-v4l2: integrate with media requests
This implements the V4L2 part of the request support. The main change is that vb2_qbuf and vb2_prepare_buf now have a new media_device pointer. This required changes to several drivers that did not use the vb2_ioctl_qbuf/prepare_buf helper functions. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/function/uvc_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index 9e33d5206d54..f2497cb96abb 100644
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -166,7 +166,7 @@ int uvcg_queue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)
unsigned long flags;
int ret;
- ret = vb2_qbuf(&queue->queue, buf);
+ ret = vb2_qbuf(&queue->queue, NULL, buf);
if (ret < 0)
return ret;