diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-17 12:50:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-17 12:50:37 -0200 |
| commit | 1415aa86ba618cd78412ef6af03ad06d5d1547c9 (patch) | |
| tree | 51db2d05ab4f070ebcbbe293a5ff1c9844e3fda7 /linux | |
| parent | b697a8c436b9b9251711908b3da7aed6cb984460 (diff) | |
| download | mediapointer-dvb-s2-1415aa86ba618cd78412ef6af03ad06d5d1547c9.tar.gz mediapointer-dvb-s2-1415aa86ba618cd78412ef6af03ad06d5d1547c9.tar.bz2 | |
backport changeset 13bcd5d0e21e3ca726965371ada8ff6c64af288f
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Original description:
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Sat Oct 13 08:25:24 2007 +0100
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.
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/videobuf-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/videobuf-dma-sg.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/videobuf-vmalloc.c | 2 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/videobuf-core.c b/linux/drivers/media/video/videobuf-core.c index 0085b9de7..e591e6ca9 100644 --- a/linux/drivers/media/video/videobuf-core.c +++ b/linux/drivers/media/video/videobuf-core.c @@ -675,7 +675,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, } /* Copy to userspace */ - retval=CALL(q,copy_user,q,data,count,nonblocking); + retval=CALL(q,video_copy_to_user,q,data,count,nonblocking); if (retval<0) goto done; diff --git a/linux/drivers/media/video/videobuf-dma-sg.c b/linux/drivers/media/video/videobuf-dma-sg.c index d71582b0b..c70beb3f0 100644 --- a/linux/drivers/media/video/videobuf-dma-sg.c +++ b/linux/drivers/media/video/videobuf-dma-sg.c @@ -691,7 +691,7 @@ static struct videobuf_qtype_ops pci_ops = { .sync = __videobuf_sync, .mmap_free = __videobuf_mmap_free, .mmap_mapper = __videobuf_mmap_mapper, - .copy_user = __videobuf_copy_to_user, + .video_copy_to_user = __videobuf_copy_to_user, .copy_stream = __videobuf_copy_stream, }; diff --git a/linux/drivers/media/video/videobuf-vmalloc.c b/linux/drivers/media/video/videobuf-vmalloc.c index f930cea6e..dfdab8746 100644 --- a/linux/drivers/media/video/videobuf-vmalloc.c +++ b/linux/drivers/media/video/videobuf-vmalloc.c @@ -321,7 +321,7 @@ static struct videobuf_qtype_ops qops = { .sync = __videobuf_sync, .mmap_free = __videobuf_mmap_free, .mmap_mapper = __videobuf_mmap_mapper, - .copy_user = __videobuf_copy_to_user, + .video_copy_to_user = __videobuf_copy_to_user, .copy_stream = __videobuf_copy_stream, }; diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index 7c30f39ca..4359823c3 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -133,7 +133,7 @@ struct videobuf_qtype_ops { enum v4l2_memory memory); int (*sync) (struct videobuf_queue* q, struct videobuf_buffer *buf); - int (*copy_user) (struct videobuf_queue *q, + int (*video_copy_to_user)(struct videobuf_queue *q, char __user *data, size_t count, int nonblocking); |