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]
/
drivers
/
video
/
cg14.c
diff --git
a/drivers/video/cg14.c
b/drivers/video/cg14.c
index
e0fc4c0
..
40d28ba
100644
(file)
--- a/
drivers/video/cg14.c
+++ b/
drivers/video/cg14.c
@@
-278,7
+278,7
@@
static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
{
struct cg14_par *par = (struct cg14_par *) info->par;
struct cg14_regs *regs = par->regs;
{
struct cg14_par *par = (struct cg14_par *) info->par;
struct cg14_regs *regs = par->regs;
- struct mdi_cfginfo kmdi,
__user
*mdii;
+ struct mdi_cfginfo kmdi, *mdii;
unsigned long flags;
int cur_mode, mode, ret = 0;
unsigned long flags;
int cur_mode, mode, ret = 0;
@@
-301,13
+301,13
@@
static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
kmdi.mdi_size = par->ramsize;
spin_unlock_irqrestore(&par->lock, flags);
kmdi.mdi_size = par->ramsize;
spin_unlock_irqrestore(&par->lock, flags);
- mdii = (struct mdi_cfginfo
__user
*) arg;
+ mdii = (struct mdi_cfginfo *) arg;
if (copy_to_user(mdii, &kmdi, sizeof(kmdi)))
ret = -EFAULT;
break;
case MDI_SET_PIXELMODE:
if (copy_to_user(mdii, &kmdi, sizeof(kmdi)))
ret = -EFAULT;
break;
case MDI_SET_PIXELMODE:
- if (get_user(mode, (int
__user
*) arg)) {
+ if (get_user(mode, (int *) arg)) {
ret = -EFAULT;
break;
}
ret = -EFAULT;
break;
}