[media] uvc gadget: switch to unlocked_ioctl
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 17 Feb 2015 08:44:07 +0000 (05:44 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Mar 2015 20:05:55 +0000 (17:05 -0300)
Instead of .ioctl use unlocked_ioctl. This allows us to finally remove
the old .ioctl op.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/usb/gadget/function/uvc_v4l2.c

index 0bd696510cf872cc86d9eafd791658653ced66d3..5a84e51675d18b5f60d4fc9e47f4c0677a2eb6f4 100644 (file)
@@ -357,7 +357,7 @@ struct v4l2_file_operations uvc_v4l2_fops = {
        .owner          = THIS_MODULE,
        .open           = uvc_v4l2_open,
        .release        = uvc_v4l2_release,
-       .ioctl          = video_ioctl2,
+       .unlocked_ioctl = video_ioctl2,
        .mmap           = uvc_v4l2_mmap,
        .poll           = uvc_v4l2_poll,
 #ifndef CONFIG_MMU