]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] pvrusb2: replace .ioctl by .unlocked_ioctl
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 17 Feb 2015 08:44:04 +0000 (05:44 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Mar 2015 20:03:42 +0000 (17:03 -0300)
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>
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c

index 35e4ea530494ffe2dea15d4786f003a66f68b9ac..91c1700eb0708a01c060f4c79d373e6ce6c10785 100644 (file)
@@ -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,
 };