lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v4l: copy_to_user() is not a good method name

Browse Source 
Breaks on any target that has copy_to_user() defined as a non-trivial
macro.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2007-10-13 08:25:24 +01:00
committed by Linus Torvalds
parent 2b8232ce51
commit 13bcd5d0e2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/videobuf-core.c
View File

@@ -674,7 +674,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
} }
/* Copy to userspace */ /* Copy to userspace */
retval=CALL(q,copy_to_user,q,data,count,nonblocking); retval=CALL(q,video_copy_to_user,q,data,count,nonblocking);
if (retval<0) if (retval<0)
goto done; goto done;

2
drivers/media/video/videobuf-dma-sg.c
View File

@@ -670,7 +670,7 @@ static struct videobuf_qtype_ops pci_ops = {
.sync = __videobuf_sync, .sync = __videobuf_sync,
.mmap_free = __videobuf_mmap_free, .mmap_free = __videobuf_mmap_free,
.mmap_mapper = __videobuf_mmap_mapper, .mmap_mapper = __videobuf_mmap_mapper,
.copy_to_user = __videobuf_copy_to_user, .video_copy_to_user = __videobuf_copy_to_user,
.copy_stream = __videobuf_copy_stream, .copy_stream = __videobuf_copy_stream,
}; };

2
drivers/media/video/videobuf-vmalloc.c
View File

@@ -320,7 +320,7 @@ static struct videobuf_qtype_ops qops = {
.sync = __videobuf_sync, .sync = __videobuf_sync,
.mmap_free = __videobuf_mmap_free, .mmap_free = __videobuf_mmap_free,
.mmap_mapper = __videobuf_mmap_mapper, .mmap_mapper = __videobuf_mmap_mapper,
.copy_to_user = __videobuf_copy_to_user, .video_copy_to_user = __videobuf_copy_to_user,
.copy_stream = __videobuf_copy_stream, .copy_stream = __videobuf_copy_stream,
}; };

2
include/media/videobuf-core.h
View File

@@ -133,7 +133,7 @@ struct videobuf_qtype_ops {
enum v4l2_memory memory); enum v4l2_memory memory);
int (*sync) (struct videobuf_queue* q, int (*sync) (struct videobuf_queue* q,
struct videobuf_buffer *buf); struct videobuf_buffer *buf);
int (*copy_to_user) (struct videobuf_queue *q, int (*video_copy_to_user)(struct videobuf_queue *q,
char __user *data, char __user *data,
size_t count, size_t count,
int nonblocking); int nonblocking);