| Message ID | 20250509-uvc-followup-v1-2-73bcde30d2b5@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | media: uvcvideo: Follow-up patches for next-media-uvc-20250509 | expand |
Hi Ricardo, Thank you for the patch. On Fri, May 09, 2025 at 06:24:14PM +0000, Ricardo Ribalda wrote: > 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 <laurent.pinchart@ideasonboard.com> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> I've reviewed this as part of a separate series, and I'll copy Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> here for patchwork to pick. > --- > 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 668a4e9d772c6d91f045ca75e2744b3a6c69da6b..862b4e34e5b629cf324479a9bb59ebe8784ccd5d 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;
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 668a4e9d772c6d91f045ca75e2744b3a6c69da6b..862b4e34e5b629cf324479a9bb59ebe8784ccd5d 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;
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 <laurent.pinchart@ideasonboard.com> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_v4l2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)