From: Hans Verkuil <hverkuil@xs4all.nl>
To: Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: linux-media@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH] [media] vb2: drop queued buffers while q->start_streaming_called is still set
Date: Fri, 09 May 2014 17:50:04 +0200 [thread overview]
Message-ID: <536CF92C.8050100@xs4all.nl> (raw)
In-Reply-To: <1399649540-20943-1-git-send-email-p.zabel@pengutronix.de>
On 05/09/2014 05:32 PM, Philipp Zabel wrote:
> Otherwise yet another warning will trigger in vb2_buffer_done.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Duplicate of: https://patchwork.linuxtv.org/patch/23723/
I'm setting your patch to superseded in patchwork.
Regards,
Hans
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
> index 4d4f6ba..bdca528 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -2088,8 +2088,6 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
> if (q->start_streaming_called)
> call_void_qop(q, stop_streaming, q);
> q->streaming = 0;
> - q->start_streaming_called = 0;
> - q->queued_count = 0;
>
> if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
> for (i = 0; i < q->num_buffers; ++i)
> @@ -2098,6 +2096,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
> /* Must be zero now */
> WARN_ON(atomic_read(&q->owned_by_drv_count));
> }
> + q->start_streaming_called = 0;
> + q->queued_count = 0;
>
> /*
> * Remove all buffers from videobuf's list...
>
prev parent reply other threads:[~2014-05-09 15:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 15:32 [PATCH] [media] vb2: drop queued buffers while q->start_streaming_called is still set Philipp Zabel
2014-05-09 15:50 ` Hans Verkuil [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=536CF92C.8050100@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=p.zabel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox