From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:42919 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757216AbcAJQXp (ORCPT ); Sun, 10 Jan 2016 11:23:45 -0500 From: Laurent Pinchart To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Hans Verkuil Subject: Re: [PATCH] videobuf2-v4l2: Fix return with value warnings Date: Sun, 10 Jan 2016 18:23:55 +0200 Message-ID: <8497172.cxLeiKAFLn@avalon> In-Reply-To: <1452441551-19426-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1452441551-19426-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: 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 > --- > 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