aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2009-11-23 14:29:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 18:41:47 -0200
commitf8b0bca1a7ea8479490bcc06835ccbf590ba2c4e (patch)
tree70444d1dfe1116071ad182435a4bdfc8c69c3d8a
parentf58d7856695b6a3a03a56250c6c591022ac9918f (diff)
downloadkernel_samsung_smdk4412-f8b0bca1a7ea8479490bcc06835ccbf590ba2c4e.zip
kernel_samsung_smdk4412-f8b0bca1a7ea8479490bcc06835ccbf590ba2c4e.tar.gz
kernel_samsung_smdk4412-f8b0bca1a7ea8479490bcc06835ccbf590ba2c4e.tar.bz2
V4L/DVB (13417): Fix videobuf_queue_vmalloc_init() prototype
For whatever reason, the device structure pointer to videobuf_queue_vmalloc_init is typed "void *", even though it's passed right through to videobuf_queue_core_init(), which expects a struct device pointer. The other videobuf implementations use struct device *; I think vmalloc should too. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf-vmalloc.c2
-rw-r--r--include/media/videobuf-vmalloc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 99d646e..d6e6a28 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -392,7 +392,7 @@ static struct videobuf_qtype_ops qops = {
void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
const struct videobuf_queue_ops *ops,
- void *dev,
+ struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 1ffdb66..4b419a257 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -31,7 +31,7 @@ struct videobuf_vmalloc_memory
void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
const struct videobuf_queue_ops *ops,
- void *dev,
+ struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,