V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl.

[safe/jmp/linux-2.6] / drivers / media / common / saa7146_fops.c

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index fad7fd8..cf06f4d 100644 (file)
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -308,7 +308,7 @@ static int fops_release(struct file *file)
        return 0;
 }
 
-static int fops_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long fops_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 /*
        DEB_EE(("file:%p, cmd:%d, arg:%li\n", file, cmd, arg));