media: video: move tegra/ov5650.c to unlocked_ioctl

Change-Id: Ia21593038a1c5cab0268f1f51d6d4c6b38d69922

diff --git a/drivers/media/video/tegra/ov5650.c b/drivers/media/video/tegra/ov5650.c
index bc57956a49bf90a67ae66f75d4963e64c6eff1c1..2c6fb10d303b32b9aed153785ae98d7749b1d4a5 100755 (executable)
--- a/drivers/media/video/tegra/ov5650.c
+++ b/drivers/media/video/tegra/ov5650.c
@@ -637,8 +637,8 @@ static int ov5650_test_pattern(struct ov5650_info *info,
                                  NULL, 0);
 }
 
-static int ov5650_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static long ov5650_ioctl(struct file *file,
+                        unsigned int cmd, unsigned long arg)
 {
        int err;
        struct ov5650_info *info = file->private_data;
@@ -723,7 +723,7 @@ int ov5650_release(struct inode *inode, struct file *file)
 static const struct file_operations ov5650_fileops = {
        .owner = THIS_MODULE,
        .open = ov5650_open,
-       .ioctl = ov5650_ioctl,
+       .unlocked_ioctl = ov5650_ioctl,
        .release = ov5650_release,
 };