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

Change-Id: I2b12aaf72ac0303725aa9b419cd7240e1a198fd8

diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c
index 7b2c73b3cc7f9af6881c8800446cc37006de404f..76cf2fcb55bcebd503959bc4d5a877d7ed9112d4 100644 (file)
--- a/drivers/media/video/tegra/tegra_camera.c
+++ b/drivers/media/video/tegra/tegra_camera.c
@@ -178,8 +178,8 @@ static int tegra_camera_reset(uint id)
        return 0;
 }
 
-static int tegra_camera_ioctl(struct inode *inode, struct file *file,
-                          unsigned int cmd, unsigned long arg)
+static long tegra_camera_ioctl(struct file *file,
+                              unsigned int cmd, unsigned long arg)
 {
        uint id;
 
@@ -263,7 +263,7 @@ static int tegra_camera_release(struct inode *inode, struct file *file)
 
 static const struct file_operations tegra_camera_fops = {
        .owner = THIS_MODULE,
-       .ioctl = tegra_camera_ioctl,
+       .unlocked_ioctl = tegra_camera_ioctl,
        .release = tegra_camera_release,
 };