Skip to content
/ linux Public

Commit 69c32df

Browse files
Michal PecioSasha Levin
authored andcommitted
media: uvcvideo: Return queued buffers on start_streaming() failure
[ Upstream commit 4cf3b6f ] 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: 7dd56c4 ("media: uvcvideo: Remove stream->is_streaming field") Cc: stable@vger.kernel.org Signed-off-by: Michal Pecio <michal.pecio@gmail.com> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patch.msgid.link/20251015133642.3dede646.michal.pecio@gmail.com Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 97330e3 commit 69c32df

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/media/usb/uvc/uvc_queue.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,18 +177,20 @@ static int uvc_start_streaming_video(struct vb2_queue *vq, unsigned int count)
177177

178178
ret = uvc_pm_get(stream->dev);
179179
if (ret)
180-
return ret;
180+
goto err_buffers;
181181

182182
queue->buf_used = 0;
183183

184184
ret = uvc_video_start_streaming(stream);
185-
if (ret == 0)
186-
return 0;
185+
if (ret)
186+
goto err_pm;
187187

188-
uvc_pm_put(stream->dev);
188+
return 0;
189189

190+
err_pm:
191+
uvc_pm_put(stream->dev);
192+
err_buffers:
190193
uvc_queue_return_buffers(queue, UVC_BUF_STATE_QUEUED);
191-
192194
return ret;
193195
}
194196

0 commit comments

Comments
 (0)