2 files changed, 7 insertions, 18 deletions

diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index ff4340a1b4b3..e9d625b35751 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -251,6 +251,12 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
         if (le16_to_cpu(ctrl->wLength) > UVC_MAX_REQUEST_SIZE)
                 return -EINVAL;
 
+        /* Tell the complete callback to generate an event for the next request
+         * that will be enqueued by UVCIOC_SEND_RESPONSE.
+         */
+        uvc->event_setup_out = !(ctrl->bRequestType & USB_DIR_IN);
+        uvc->event_length = le16_to_cpu(ctrl->wLength);
+
         memset(&v4l2_event, 0, sizeof(v4l2_event));
         v4l2_event.type = UVC_EVENT_SETUP;
         memcpy(&uvc_event->req, ctrl, sizeof(uvc_event->req));
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index bcd71cee7b51..f22b878f163a 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -271,25 +271,8 @@ uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         /* Events */
         case VIDIOC_DQEVENT:
-        {
-                struct v4l2_event *event = arg;
-
-                ret = v4l2_event_dequeue(&handle->vfh, event,
+                return v4l2_event_dequeue(&handle->vfh, arg,
                                          file->f_flags & O_NONBLOCK);
-                if (ret == 0 && event->type == UVC_EVENT_SETUP) {
-                        struct uvc_event *uvc_event = (void *)&event->u.data;
-
-                        /* Tell the complete callback to generate an event for
-                         * the next request that will be enqueued by
-                         * uvc_event_write.
-                         */
-                        uvc->event_setup_out =
-                                !(uvc_event->req.bRequestType & USB_DIR_IN);
-                        uvc->event_length = uvc_event->req.wLength;
-                }
-
-                return ret;
-        }
 
         case VIDIOC_SUBSCRIBE_EVENT:
         {