From 1aa5151f7dd35a7979fb037e90ec9cc83b97b18b Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Mon, 30 Aug 2010 18:13:53 -0700 Subject: [PATCH] media: video: move tegra/tegra_camera.c to unlocked_ioctl Change-Id: I2b12aaf72ac0303725aa9b419cd7240e1a198fd8 --- drivers/media/video/tegra/tegra_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c index 7b2c73b3cc7f..76cf2fcb55bc 100644 --- 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, }; -- 2.34.1