diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-11 00:47:18 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-11 00:47:18 -0700 |
| commit | 7f17cff10f65dcedee301bcf9cf8163ec2528588 (patch) | |
| tree | 28f515c5960006997b29721d287484c8be61ef08 /linux | |
| parent | fe31bcb9f3e7705804f813000ab9fdc74b64754e (diff) | |
| download | mediapointer-dvb-s2-7f17cff10f65dcedee301bcf9cf8163ec2528588.tar.gz mediapointer-dvb-s2-7f17cff10f65dcedee301bcf9cf8163ec2528588.tar.bz2 | |
git-dvb: rename videobuf_qtype_ops.copy_to_user()
From: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
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 8b79d218d..e1ca1d78c 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_to_user,q,data,count,nonblocking); + retval=CALL(q,copy_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 d7504c99b..d71582b0b 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_to_user = __videobuf_copy_to_user, + .copy_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 a33a4dbbf..f930cea6e 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_to_user = __videobuf_copy_to_user, + .copy_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 43b4d5138..7c30f39ca 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_to_user) (struct videobuf_queue *q, + int (*copy_user) (struct videobuf_queue *q, char __user *data, size_t count, int nonblocking); |