Commit 13bcd5d0 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

v4l: copy_to_user() is not a good method name

Breaks on any target that has copy_to_user() defined as a non-trivial
macro.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2b8232ce
...@@ -674,7 +674,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, ...@@ -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;
......
...@@ -670,7 +670,7 @@ static struct videobuf_qtype_ops pci_ops = { ...@@ -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,
}; };
......
...@@ -320,7 +320,7 @@ static struct videobuf_qtype_ops qops = { ...@@ -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,
}; };
......
...@@ -133,7 +133,7 @@ struct videobuf_qtype_ops { ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment