summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-core.c
diff options
context:
space:
mode:
authorHans Verkuil2010-03-28 13:18:37 +0200
committerMauro Carvalho Chehab2010-05-19 17:57:52 +0200
commit037c75eb14cd6adb837f81f0c2b2a52c31c91e69 (patch)
tree79c54264c79256262f2d0079575ddcfcbb49f5c5 /drivers/media/video/videobuf-core.c
parentV4L/DVB: v4l videobuf: use struct videobuf_buffer * instead of void * for vid... (diff)
downloadkernel-qcow2-linux-037c75eb14cd6adb837f81f0c2b2a52c31c91e69.tar.gz
kernel-qcow2-linux-037c75eb14cd6adb837f81f0c2b2a52c31c91e69.tar.xz
kernel-qcow2-linux-037c75eb14cd6adb837f81f0c2b2a52c31c91e69.zip
V4L/DVB: v4l videobuf: rename .vmalloc to .vaddr
Rename the .vmalloc op in struct videobuf_qtype_ops to .vaddr. This op returns the virtual kernel address of a buffer. vaddr is a lot less confusing than vmalloc since this callback does do any allocations. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf-core.c')
-rw-r--r--drivers/media/video/videobuf-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 7b69f6b00a3d..26241a833894 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -108,8 +108,8 @@ EXPORT_SYMBOL_GPL(videobuf_iolock);
void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
struct videobuf_buffer *buf)
{
- if (q->int_ops->vmalloc)
- return q->int_ops->vmalloc(buf);
+ if (q->int_ops->vaddr)
+ return q->int_ops->vaddr(buf);
else
return NULL;
}