From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 17 Feb 2015 08:44:07 +0000 (-0300)
Subject: [media] uvc gadget: switch to unlocked_ioctl
X-Git-Tag: firefly_0821_release~176^2~795^2~1329
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9945eb9fad4edba2893d15cd720a702e6281ce19;p=firefly-linux-kernel-4.4.55.git

[media] uvc gadget: switch to unlocked_ioctl

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>
---

diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 0bd696510cf8..5a84e51675d1 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -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