* [PATCH] videobuf2-v4l2: Fix return with value warnings
@ 2016-01-10 15:59 Laurent Pinchart
2016-01-10 16:23 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2016-01-10 15:59 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
Commit 10cc3b1e1296 ("videobuf2-core: fill_user_buffer and
copy_timestamp should return void") forgot one return statement from the
videobuf2-v4l2 implementations of copy_timestamp and fill_user_buffer.
Remove them.
Fixes: 10cc3b1e1296 ("videobuf2-core: fill_user_buffer and copy_timestamp should return void")
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
drivers/media/v4l2-core/videobuf2-v4l2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index a15cd1b4c7f0..bbbd8e1b1a99 100644
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -121,7 +121,7 @@ static void __copy_timestamp(struct vb2_buffer *vb, const void *pb)
struct vb2_queue *q = vb->vb2_queue;
if (!pb)
- return 0;
+ return;
if (q->is_output) {
/*
@@ -197,7 +197,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
unsigned int plane;
if (!pb)
- return 0;
+ return;
/* Copy back data such as timestamp, flags, etc. */
b->index = vb->index;
--
2.4.10
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] videobuf2-v4l2: Fix return with value warnings
2016-01-10 15:59 [PATCH] videobuf2-v4l2: Fix return with value warnings Laurent Pinchart
@ 2016-01-10 16:23 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2016-01-10 16:23 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: linux-media, Hans Verkuil
On Sunday 10 January 2016 17:59:11 Laurent Pinchart wrote:
> Commit 10cc3b1e1296 ("videobuf2-core: fill_user_buffer and
> copy_timestamp should return void") forgot one return statement from the
> videobuf2-v4l2 implementations of copy_timestamp and fill_user_buffer.
> Remove them.
>
> Fixes: 10cc3b1e1296 ("videobuf2-core: fill_user_buffer and copy_timestamp
> should return void")
And that commit isn't upstream -_-'
Sorry for the noise.
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/media/v4l2-core/videobuf2-v4l2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c
> b/drivers/media/v4l2-core/videobuf2-v4l2.c index a15cd1b4c7f0..bbbd8e1b1a99
> 100644
> --- a/drivers/media/v4l2-core/videobuf2-v4l2.c
> +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
> @@ -121,7 +121,7 @@ static void __copy_timestamp(struct vb2_buffer *vb,
> const void *pb) struct vb2_queue *q = vb->vb2_queue;
>
> if (!pb)
> - return 0;
> + return;
>
> if (q->is_output) {
> /*
> @@ -197,7 +197,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb,
> void *pb) unsigned int plane;
>
> if (!pb)
> - return 0;
> + return;
>
> /* Copy back data such as timestamp, flags, etc. */
> b->index = vb->index;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-10 16:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-10 15:59 [PATCH] videobuf2-v4l2: Fix return with value warnings Laurent Pinchart
2016-01-10 16:23 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox