|
@@ -2087,9 +2087,6 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
|
|
*/
|
|
*/
|
|
if (q->start_streaming_called)
|
|
if (q->start_streaming_called)
|
|
call_void_qop(q, stop_streaming, q);
|
|
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))) {
|
|
if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
|
|
for (i = 0; i < q->num_buffers; ++i)
|
|
for (i = 0; i < q->num_buffers; ++i)
|
|
@@ -2099,6 +2096,10 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
|
|
WARN_ON(atomic_read(&q->owned_by_drv_count));
|
|
WARN_ON(atomic_read(&q->owned_by_drv_count));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ q->streaming = 0;
|
|
|
|
+ q->start_streaming_called = 0;
|
|
|
|
+ q->queued_count = 0;
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Remove all buffers from videobuf's list...
|
|
* Remove all buffers from videobuf's list...
|
|
*/
|
|
*/
|