From 7e666b1aaccadf7ba3ba8c0d0eed5bf876b14d8e Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Fri, 9 May 2025 18:24:14 +0000 Subject: [PATCH] media: uvcvideo: Refactor uvc_queue_streamon Do uvc_pm_get before we call uvc_queue_streamon. Although the current code is correct, uvc_ioctl_streamon is allways called after uvc_pm_get, this change makes the code more resiliant to future changes. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/20250509-uvc-followup-v1-2-73bcde30d2b5@chromium.org Signed-off-by: Laurent Pinchart Signed-off-by: Hans Verkuil --- drivers/media/usb/uvc/uvc_v4l2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 668a4e9d772c6..862b4e34e5b62 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -853,15 +853,16 @@ static int uvc_ioctl_streamon(struct file *file, void *fh, if (handle->is_streaming) return 0; - ret = uvc_queue_streamon(&stream->queue, type); + ret = uvc_pm_get(stream->dev); if (ret) return ret; - ret = uvc_pm_get(stream->dev); + ret = uvc_queue_streamon(&stream->queue, type); if (ret) { - uvc_queue_streamoff(&stream->queue, type); + uvc_pm_put(stream->dev); return ret; } + handle->is_streaming = true; return 0; -- 2.51.0