git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[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
38dbacf
..
7b9f3ea
100644
(file)
--- 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
*/
* 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);
{
struct video_device *dev = video_devdata(file);
tea575x_t *tea = video_get_drvdata(dev);
- void __user *arg = (void __user *)data;
switch(cmd) {
case VIDIOCGCAP:
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
*/
/*
* initialize all the tea575x chips
*/