Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

1 files changed, 3 insertions, 19 deletions

diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index a7158053276a..cfb58384394d 100644
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -123,24 +123,12 @@ uvc_v4l2_open(struct file *file)
         struct video_device *vdev = video_devdata(file);
         struct uvc_device *uvc = video_get_drvdata(vdev);
         struct uvc_file_handle *handle;
-        int ret;
 
         handle = kzalloc(sizeof(*handle), GFP_KERNEL);
         if (handle == NULL)
                 return -ENOMEM;
 
-        ret = v4l2_fh_init(&handle->vfh, vdev);
-        if (ret < 0)
-                goto error;
-
-        ret = v4l2_event_init(&handle->vfh);
-        if (ret < 0)
-                goto error;
-
-        ret = v4l2_event_alloc(&handle->vfh, 8);
-        if (ret < 0)
-                goto error;
-
+        v4l2_fh_init(&handle->vfh, vdev);
         v4l2_fh_add(&handle->vfh);
 
         handle->device = &uvc->video;
@@ -148,10 +136,6 @@ uvc_v4l2_open(struct file *file)
 
         uvc_function_connect(uvc);
         return 0;
-
-error:
-        v4l2_fh_exit(&handle->vfh);
-        return ret;
 }
 
 static int
@@ -313,7 +297,7 @@ uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (sub->type < UVC_EVENT_FIRST || sub->type > UVC_EVENT_LAST)
                         return -EINVAL;
 
-                return v4l2_event_subscribe(&handle->vfh, arg);
+                return v4l2_event_subscribe(&handle->vfh, arg, 2);
         }
 
         case VIDIOC_UNSUBSCRIBE_EVENT:
@@ -353,7 +337,7 @@ uvc_v4l2_poll(struct file *file, poll_table *wait)
         struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data);
         unsigned int mask = 0;
 
-        poll_wait(file, &handle->vfh.events->wait, wait);
+        poll_wait(file, &handle->vfh.wait, wait);
         if (v4l2_event_pending(&handle->vfh))
                 mask |= POLLPRI;