aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa5249.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa5249.c')
-rw-r--r--drivers/media/video/saa5249.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 3bb959c25d9d..6ef3affb97f1 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -8,7 +8,7 @@
8 * you can add arbitary multiple teletext devices to Linux video4linux 8 * you can add arbitary multiple teletext devices to Linux video4linux
9 * now (well 32 anyway). 9 * now (well 32 anyway).
10 * 10 *
11 * Alan Cox <Alan.Cox@linux.org> 11 * Alan Cox <alan@lxorguk.ukuu.org.uk>
12 * 12 *
13 * The original driver was heavily modified to match the i2c interface 13 * The original driver was heavily modified to match the i2c interface
14 * It was truncated to use the WinTV boards, too. 14 * It was truncated to use the WinTV boards, too.
@@ -190,8 +190,7 @@ static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
190 * Standard character-device-driver functions 190 * Standard character-device-driver functions
191 */ 191 */
192 192
193static int do_saa5249_ioctl(struct inode *inode, struct file *file, 193static int do_saa5249_ioctl(struct file *file, unsigned int cmd, void *arg)
194 unsigned int cmd, void *arg)
195{ 194{
196 static int virtual_mode = false; 195 static int virtual_mode = false;
197 struct saa5249_device *t = video_drvdata(file); 196 struct saa5249_device *t = video_drvdata(file);
@@ -488,7 +487,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
488 487
489 cmd = vtx_fix_command(cmd); 488 cmd = vtx_fix_command(cmd);
490 mutex_lock(&t->lock); 489 mutex_lock(&t->lock);
491 err = video_usercopy(inode,file,cmd,arg,do_saa5249_ioctl); 490 err = video_usercopy(file, cmd, arg, do_saa5249_ioctl);
492 mutex_unlock(&t->lock); 491 mutex_unlock(&t->lock);
493 return err; 492 return err;
494} 493}