1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index 5e807f083bc8..55828705d859 100644
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -130,13 +130,7 @@ uvc_v4l2_open(struct file *file)
         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;
+        v4l2_fh_init(&handle->vfh, vdev);
 
         ret = v4l2_event_alloc(&handle->vfh, 8);
         if (ret < 0)
@@ -354,7 +348,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;