summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorHans Verkuil2015-02-17 09:44:04 +0100
committerMauro Carvalho Chehab2015-03-02 21:03:42 +0100
commitab91c61129a7ef5b584d68670dcf8ca93d3611e5 (patch)
tree2cb9d8e178edbb39cacf34371b9886b614f964a8 /drivers/media/usb
parent[media] media: i2c: ADV7604: Rename adv7604 prefixes (diff)
downloadkernel-qcow2-linux-ab91c61129a7ef5b584d68670dcf8ca93d3611e5.tar.gz
kernel-qcow2-linux-ab91c61129a7ef5b584d68670dcf8ca93d3611e5.tar.xz
kernel-qcow2-linux-ab91c61129a7ef5b584d68670dcf8ca93d3611e5.zip
[media] pvrusb2: replace .ioctl by .unlocked_ioctl
As far as I can tell pvrusb2 does its own locking, so there is no need to use .ioctl. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index 35e4ea530494..91c1700eb070 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -1247,7 +1247,7 @@ static const struct v4l2_file_operations vdev_fops = {
.open = pvr2_v4l2_open,
.release = pvr2_v4l2_release,
.read = pvr2_v4l2_read,
- .ioctl = pvr2_v4l2_ioctl,
+ .unlocked_ioctl = pvr2_v4l2_ioctl,
.poll = pvr2_v4l2_poll,
};