On Wed Oct 15 13:36:42 2025 +0200, Michal Pecio wrote:
> Return buffers if streaming fails to start due to uvc_pm_get() error.
>
> This bug may be responsible for a warning I got running
>
> while :; do yavta -c3 /dev/video0; done
>
> on an xHCI controller which failed under this workload.
> I had no luck reproducing this warning again to confirm.
>
> xhci_hcd 0000:09:00.0: HC died; cleaning up
> usb 13-2: USB disconnect, device number 2
> WARNING: CPU: 2 PID: 29386 at
> drivers/media/common/videobuf2/videobuf2-core.c:1803
> vb2_start_streaming+0xac/0x120
>
> Fixes: 7dd56c47784a ("media: uvcvideo: Remove stream->is_streaming field")
> Cc: [email protected]
> Signed-off-by: Michal Pecio <[email protected]>
> Reviewed-by: Ricardo Ribalda <[email protected]>
> Reviewed-by: Laurent Pinchart <[email protected]>
> Link: https://patch.msgid.link/[email protected]
> Signed-off-by: Laurent Pinchart <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/usb/uvc/uvc_queue.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/drivers/media/usb/uvc/uvc_queue.c
b/drivers/media/usb/uvc/uvc_queue.c
index 681a74ed09fb..8b8f44b4a045 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -177,18 +177,20 @@ static int uvc_start_streaming_video(struct vb2_queue
*vq, unsigned int count)
ret = uvc_pm_get(stream->dev);
if (ret)
- return ret;
+ goto err_buffers;
queue->buf_used = 0;
ret = uvc_video_start_streaming(stream);
- if (ret == 0)
- return 0;
+ if (ret)
+ goto err_pm;
- uvc_pm_put(stream->dev);
+ return 0;
+err_pm:
+ uvc_pm_put(stream->dev);
+err_buffers:
uvc_queue_return_buffers(queue, UVC_BUF_STATE_QUEUED);
-
return ret;
}
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
