VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / i2c / other / tea575x-tuner.c

diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 7b9f3ea..38dbacf 100644 (file)
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -85,11 +85,12 @@ static void snd_tea575x_set_freq(tea575x_t *tea)
  * Linux Video interface
  */
 
-static int snd_tea575x_do_ioctl(struct inode *inode, struct file *file,
-                               unsigned int cmd, void *arg)
+static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
+                            unsigned int cmd, unsigned long data)
 {
        struct video_device *dev = video_devdata(file);
        tea575x_t *tea = video_get_drvdata(dev);
+       void __user *arg = (void __user *)data;
        
        switch(cmd) {
                case VIDIOCGCAP:
@@ -167,12 +168,6 @@ static int snd_tea575x_do_ioctl(struct inode *inode, struct file *file,
        }
 }
 
-static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
-                            unsigned int cmd, unsigned long arg)
-{
-       return video_usercopy(inode, file, cmd, arg, snd_tea575x_do_ioctl);
-}
-
 /*
  * initialize all the tea575x chips
  */