diff options
author | Ricardo Ribalda <ricardo.ribalda@gmail.com> | 2013-08-28 03:39:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-09-26 06:31:06 -0400 |
commit | 819585bc4811bc54e316dfe521ce163816fa0ad1 (patch) | |
tree | 535e76be27bc93ede022c109407736e15c549ad4 /drivers/media/v4l2-core/videobuf2-core.c | |
parent | ee35fa2267df3ebe36819dd5381e0067d574131f (diff) |
[media] videobuf2: Fix vb2_write prototype
struct v4_file_operations defines the data param as
const char __user *data but on vb2 is defined as
char __user *data.
This patch fixes the warnings produced by this. ie:
drivers/qtec/qtec_xform.c:817:2: warning: initialization from
incompatible pointer type [enabled by default]
drivers/qtec/qtec_xform.c:817:2: warning: (near initialization for
‘qtec_xform_v4l_fops.write’) [enabled by default]
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/videobuf2-core.c')
-rw-r--r-- | drivers/media/v4l2-core/videobuf2-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 594c75eab5a5..67ddadd5ea38 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c | |||
@@ -2467,10 +2467,11 @@ size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count, | |||
2467 | } | 2467 | } |
2468 | EXPORT_SYMBOL_GPL(vb2_read); | 2468 | EXPORT_SYMBOL_GPL(vb2_read); |
2469 | 2469 | ||
2470 | size_t vb2_write(struct vb2_queue *q, char __user *data, size_t count, | 2470 | size_t vb2_write(struct vb2_queue *q, const char __user *data, size_t count, |
2471 | loff_t *ppos, int nonblocking) | 2471 | loff_t *ppos, int nonblocking) |
2472 | { | 2472 | { |
2473 | return __vb2_perform_fileio(q, data, count, ppos, nonblocking, 0); | 2473 | return __vb2_perform_fileio(q, (char __user *) data, count, |
2474 | ppos, nonblocking, 0); | ||
2474 | } | 2475 | } |
2475 | EXPORT_SYMBOL_GPL(vb2_write); | 2476 | EXPORT_SYMBOL_GPL(vb2_write); |
2476 | 2477 | ||
@@ -2631,7 +2632,7 @@ int vb2_fop_release(struct file *file) | |||
2631 | } | 2632 | } |
2632 | EXPORT_SYMBOL_GPL(vb2_fop_release); | 2633 | EXPORT_SYMBOL_GPL(vb2_fop_release); |
2633 | 2634 | ||
2634 | ssize_t vb2_fop_write(struct file *file, char __user *buf, | 2635 | ssize_t vb2_fop_write(struct file *file, const char __user *buf, |
2635 | size_t count, loff_t *ppos) | 2636 | size_t count, loff_t *ppos) |
2636 | { | 2637 | { |
2637 | struct video_device *vdev = video_devdata(file); | 2638 | struct video_device *vdev = video_devdata(file); |