1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 28023f9f1dc7..6cd6a25b25d7 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -781,9 +781,19 @@ static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)
 static void solo_enc_stop_streaming(struct vb2_queue *q)
 {
         struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
+        unsigned long flags;
 
+        spin_lock_irqsave(&solo_enc->av_lock, flags);
         solo_enc_off(solo_enc);
-        INIT_LIST_HEAD(&solo_enc->vidq_active);
+        while (!list_empty(&solo_enc->vidq_active)) {
+                struct solo_vb2_buf *buf = list_entry(
+                                solo_enc->vidq_active.next,
+                                struct solo_vb2_buf, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+        }
+        spin_unlock_irqrestore(&solo_enc->av_lock, flags);
         solo_ring_stop(solo_enc->solo_dev);
 }