X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fi2c%2Fother%2Ftea575x-tuner.c;h=7b9f3ea7653faf0d4e0c24a175c9851c519707a8;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=38dbacf90a92dc2c9100e8021144353abe7f9b0f;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c index 38dbacf90..7b9f3ea76 100644 --- a/sound/i2c/other/tea575x-tuner.c +++ b/sound/i2c/other/tea575x-tuner.c @@ -85,12 +85,11 @@ static void snd_tea575x_set_freq(tea575x_t *tea) * Linux Video interface */ -static int snd_tea575x_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long data) +static int snd_tea575x_do_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, void *arg) { struct video_device *dev = video_devdata(file); tea575x_t *tea = video_get_drvdata(dev); - void __user *arg = (void __user *)data; switch(cmd) { case VIDIOCGCAP: @@ -168,6 +167,12 @@ static int snd_tea575x_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 */