diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
| commit | 13cc5c3d863d8cd61a10bea470bef19c50730217 (patch) | |
| tree | a88d8189d02769ab095fe1d2d229c9ddbc746c63 /linux/drivers/media/video/tvmixer.c | |
| parent | 6550ed72a57b714bfb1a718538d1fb5c542aa470 (diff) | |
| download | mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.gz mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.bz2 | |
- merge 2.6.9-rc1 changes (mostly __user stuff).
Diffstat (limited to 'linux/drivers/media/video/tvmixer.c')
| -rw-r--r-- | linux/drivers/media/video/tvmixer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index f5917b636..ec59e4598 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -19,8 +19,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) # include "i2c-compat.h" # include "id.h" -#else -# include <media/id.h> #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71) # define strlcpy(dest,src,len) strncpy(dest,src,(len)-1) @@ -89,6 +87,8 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm int left,right,ret,val = 0; struct TVMIXER *mix = file->private_data; struct i2c_client *client = mix->dev; + void __user *argp = (void __user *)arg; + int __user *p = argp; if (NULL == client) return -ENODEV; @@ -98,7 +98,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm strlcpy(info.id, "tv card", sizeof(info.id)); strlcpy(info.name, i2c_clientname(client), sizeof(info.name)); info.modify_counter = 42 /* FIXME */; - if (copy_to_user((void *)arg, &info, sizeof(info))) + if (copy_to_user(argp, &info, sizeof(info))) return -EFAULT; return 0; } @@ -106,15 +106,15 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm _old_mixer_info info; strlcpy(info.id, "tv card", sizeof(info.id)); strlcpy(info.name, i2c_clientname(client), sizeof(info.name)); - if (copy_to_user((void *)arg, &info, sizeof(info))) + if (copy_to_user(argp, &info, sizeof(info))) return -EFAULT; return 0; } if (cmd == OSS_GETVERSION) - return put_user(SOUND_VERSION, (int *)arg); + return put_user(SOUND_VERSION, p); if (_SIOC_DIR(cmd) & _SIOC_WRITE) - if (get_user(val, (int *)arg)) + if (get_user(val, p)) return -EFAULT; /* read state */ @@ -180,7 +180,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm default: return -EINVAL; } - if (put_user(ret, (int *)arg)) + if (put_user(ret, p)) return -EFAULT; return 0; } |