* [PATCH] [media] vb2: drop queued buffers while q->start_streaming_called is still set
@ 2014-05-09 15:32 Philipp Zabel
2014-05-09 15:50 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2014-05-09 15:32 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media, kernel, Philipp Zabel
Otherwise yet another warning will trigger in vb2_buffer_done.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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...
--
2.0.0.rc0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [media] vb2: drop queued buffers while q->start_streaming_called is still set
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
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2014-05-09 15:50 UTC (permalink / raw)
To: Philipp Zabel, Mauro Carvalho Chehab; +Cc: linux-media, kernel
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...
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-09 15:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox