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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
media
/
video
/
videodev.c
diff --git
a/drivers/media/video/videodev.c
b/drivers/media/video/videodev.c
index
afaf612
..
fbc5cb1
100644
(file)
--- a/
drivers/media/video/videodev.c
+++ b/
drivers/media/video/videodev.c
@@
-183,7
+183,7
@@
video_usercopy(struct inode *inode, struct file *file,
/* Copy arguments into temp kernel buffer */
switch (_IOC_DIR(cmd)) {
case _IOC_NONE:
/* Copy arguments into temp kernel buffer */
switch (_IOC_DIR(cmd)) {
case _IOC_NONE:
- parg =
(void *)arg
;
+ parg =
NULL
;
break;
case _IOC_READ:
case _IOC_WRITE:
break;
case _IOC_READ:
case _IOC_WRITE:
@@
-200,7
+200,7
@@
video_usercopy(struct inode *inode, struct file *file,
err = -EFAULT;
if (_IOC_DIR(cmd) & _IOC_WRITE)
err = -EFAULT;
if (_IOC_DIR(cmd) & _IOC_WRITE)
- if (copy_from_user(parg, (void *)arg, _IOC_SIZE(cmd)))
+ if (copy_from_user(parg, (void
__user
*)arg, _IOC_SIZE(cmd)))
goto out;
break;
}
goto out;
break;
}
@@
-217,7
+217,7
@@
video_usercopy(struct inode *inode, struct file *file,
{
case _IOC_READ:
case (_IOC_WRITE | _IOC_READ):
{
case _IOC_READ:
case (_IOC_WRITE | _IOC_READ):
- if (copy_to_user((void *)arg, parg, _IOC_SIZE(cmd)))
+ if (copy_to_user((void
__user
*)arg, parg, _IOC_SIZE(cmd)))
err = -EFAULT;
break;
}
err = -EFAULT;
break;
}
@@
-231,7
+231,7
@@
out:
/*
* open/release helper functions -- handle exclusive opens
*/
/*
* open/release helper functions -- handle exclusive opens
*/
-
extern
int video_exclusive_open(struct inode *inode, struct file *file)
+int video_exclusive_open(struct inode *inode, struct file *file)
{
struct video_device *vfl = video_devdata(file);
int retval = 0;
{
struct video_device *vfl = video_devdata(file);
int retval = 0;
@@
-246,7
+246,7
@@
extern int video_exclusive_open(struct inode *inode, struct file *file)
return retval;
}
return retval;
}
-
extern
int video_exclusive_release(struct inode *inode, struct file *file)
+int video_exclusive_release(struct inode *inode, struct file *file)
{
struct video_device *vfl = video_devdata(file);
{
struct video_device *vfl = video_devdata(file);