From eab7b3ca6dcd6e83a241f0bce0418233222a73b3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 21 Sep 2010 23:35:28 -0700 Subject: [PATCH] media: video: tegra: dw9714l: Convert ioctl to unlocked_ioctl Change-Id: If43ceacb5739f8f98b550b16150d1b04b1ba485d Signed-off-by: Colin Cross --- drivers/media/video/tegra/dw9714l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/tegra/dw9714l.c b/drivers/media/video/tegra/dw9714l.c index 26c36c3a0803..e940501d92ab 100644 --- a/drivers/media/video/tegra/dw9714l.c +++ b/drivers/media/video/tegra/dw9714l.c @@ -156,7 +156,7 @@ static int dw9714l_set_position(struct dw9714l_info *info, u32 position) return ret; } -static int dw9714l_ioctl(struct inode *inode, struct file *file, +static long dw9714l_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct dw9714l_info *info = file->private_data; @@ -221,7 +221,7 @@ int dw9714l_release(struct inode *inode, struct file *file) static const struct file_operations dw9714l_fileops = { .owner = THIS_MODULE, .open = dw9714l_open, - .ioctl = dw9714l_ioctl, + .unlocked_ioctl = dw9714l_ioctl, .release = dw9714l_release, }; -- 2.34.1