[PATCH v2] media: go7007: return queued buffers on start_streaming() failure
From: YuanZhe Liu
Date: Thu Nov 12 2026 - 09:16:57 EST
The vb2 framework hands ownership of every queued buffer to the driver
through the buf_queue() callback before start_streaming() is called. If
start_streaming() then returns an error, the driver must return those
buffers to vb2 with vb2_buffer_done() and VB2_BUF_STATE_QUEUED.
Otherwise vb2_start_streaming() fires WARN_ON(owned_by_drv_count) and
forcibly reclaims the buffers.
go7007_start_streaming() returns -EIO when go7007_start_encoder() fails,
which happens for example when a USB transfer cannot be submitted because
the device has been disconnected:
go7007 1-1:1.0: error submitting audio urb 5: -2
go7007 1-1:1.0: error starting stream transfer
WARNING: drivers/media/common/videobuf2/videobuf2-core.c:1797 at vb2_start_streaming
but it leaves the already queued buffers on go->vidq_active. Give them
back to vb2 with VB2_BUF_STATE_QUEUED before bailing out.
Fixes: 7955f03d18d1 ("[media] go7007: move out of staging into drivers/media/usb.")
Cc: stable@xxxxxxxxxxxxxxx
Co-developed-by: Bin Yu <byu@xxxxxxxxxxxxx>
Signed-off-by: Bin Yu <byu@xxxxxxxxxxxxx>
Co-developed-by: Cheng Wen <wencheng@xxxxxxxxxxxxx>
Signed-off-by: Cheng Wen <wencheng@xxxxxxxxxxxxx>
Signed-off-by: YuanZhe Liu <25031212351@xxxxxxxxxxxxxxxxx>
---
Changes in v2:
- Inline the buffer return into go7007_start_streaming() as requested and
drop the separate helper.
- Drop the redundant go->active_buf = NULL: active_buf is still NULL when
go7007_start_encoder() fails.
drivers/media/usb/go7007/go7007-v4l2.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
index 2087ffcb85a5..030a127cb9ea 100644
--- a/drivers/media/usb/go7007/go7007-v4l2.c
+++ b/drivers/media/usb/go7007/go7007-v4l2.c
@@ -409,8 +409,26 @@ static int go7007_start_streaming(struct vb2_queue *q, unsigned int count)
else
ret = 0;
mutex_unlock(&go->hw_lock);
- if (ret)
+ if (ret) {
+ struct go7007_buffer *vb, *tmp;
+ unsigned long flags;
+ LIST_HEAD(buffers);
+
+ /*
+ * The queued buffers were handed over to the driver before
+ * start_streaming() was called, so they have to be returned
+ * with VB2_BUF_STATE_QUEUED.
+ */
+ spin_lock_irqsave(&go->spinlock, flags);
+ list_splice_init(&go->vidq_active, &buffers);
+ spin_unlock_irqrestore(&go->spinlock, flags);
+
+ list_for_each_entry_safe(vb, tmp, &buffers, list) {
+ list_del(&vb->list);
+ vb2_buffer_done(&vb->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
+ }
return ret;
+ }
call_all(&go->v4l2_dev, video, s_stream, 1);
v4l2_ctrl_grab(go->mpeg_video_gop_size, true);
v4l2_ctrl_grab(go->mpeg_video_gop_closure, true);
--
2.34.1