Hi,
On 26-Feb-25 15:23, Ricardo Ribalda wrote:
> Add a variable in the file handle state to figure out if a camera is in
> the streaming state or not. This variable will be used in the future for
> power management policies.
>
> Now that we are at it, make use of guards to simplify the code.
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/media/usb/uvc/uvc_v4l2.c | 18 +++++++++++++-----
> drivers/media/usb/uvc/uvcvideo.h | 1 +
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> index 93c6cdb23881..f9cd6db759c5 100644
> --- a/drivers/media/usb/uvc/uvc_v4l2.c
> +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> @@ -835,11 +835,18 @@ static int uvc_ioctl_streamon(struct file *file, void *fh,
> if (!uvc_has_privileges(handle))
> return -EBUSY;
>
> - mutex_lock(&stream->mutex);
> + guard(mutex)(&stream->mutex);
> +
> + if (handle->is_streaming)
> + return 0;
> +
> ret = uvc_queue_streamon(&stream->queue, type);
> - mutex_unlock(&stream->mutex);
> + if (ret)
> + return ret;
>
> - return ret;
> + handle->is_streaming = true;
> +
> + return 0;
> }
>
> static int uvc_ioctl_streamoff(struct file *file, void *fh,
> @@ -851,9 +858,10 @@ static int uvc_ioctl_streamoff(struct file *file, void *fh,
> if (!uvc_has_privileges(handle))
> return -EBUSY;
>
> - mutex_lock(&stream->mutex);
> + guard(mutex)(&stream->mutex);
> +
> uvc_queue_streamoff(&stream->queue, type);
> - mutex_unlock(&stream->mutex);
> + handle->is_streaming = false;
>
> return 0;
> }
> diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> index 5e388f05f3fc..bc87e1f2c669 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -618,6 +618,7 @@ struct uvc_fh {
> struct uvc_streaming *stream;
> enum uvc_handle_state state;
> unsigned int pending_async_ctrls;
> + bool is_streaming;
> };
>
> struct uvc_driver {
>
