Merge remote-tracking branch 'linus/master' into staging/for_v3.5

[~andy/linux] / drivers / usb / gadget / uvc_v4l2.c

diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index 54d7ca559cb215f5fc963d10cdd0b99d6367c777..2ca9386d655bc69fa5b02f55b14e5bcae3b0d4ad 100644 (file)
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -296,7 +296,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, 2);
+               return v4l2_event_subscribe(&handle->vfh, arg, 2, NULL);
        }
 
        case VIDIOC_UNSUBSCRIBE_EVENT: