]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
usb: gadget: uvc: Add missing call for additional setup data
authorPetr Cvek <petr.cvek@tul.cz>
Wed, 17 Aug 2016 10:36:57 +0000 (12:36 +0200)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Wed, 31 Aug 2016 07:06:04 +0000 (10:06 +0300)
Some UVC commands require additional data (non zero uvc->event_length).
Add usb_ep_queue() call, so uvc_function_ep0_complete() can be called
and send received data to the userspace.

Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/gadget/function/f_uvc.c

index 29b41b5dee04d2e0e3e87a6dc97d6dde84af49d0..27ed51b5082f66de17c41761f260a4b96dcc0f33 100644 (file)
@@ -258,6 +258,13 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
        memcpy(&uvc_event->req, ctrl, sizeof(uvc_event->req));
        v4l2_event_queue(&uvc->vdev, &v4l2_event);
 
+       /* Pass additional setup data to userspace */
+       if (uvc->event_setup_out && uvc->event_length) {
+               uvc->control_req->length = uvc->event_length;
+               return usb_ep_queue(uvc->func.config->cdev->gadget->ep0,
+                       uvc->control_req, GFP_ATOMIC);
+       }
+
        return 0;
 }