Today, when we are applying a change to entities A, B. If A succeeds and B
fails the events for A are not sent.
This change changes the code so the events for A are send right after
they happen.
Cc: stable@kernel.org
Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index f2484f6d21c1..7d074686eef4 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1705,7 +1705,9 @@ static bool uvc_ctrl_xctrls_has_control(const struct v4l2_ext_control *xctrls,
}
static void uvc_ctrl_send_events(struct uvc_fh *handle,
- const struct v4l2_ext_control *xctrls, unsigned int xctrls_count)
+ struct uvc_entity *entity,
+ const struct v4l2_ext_control *xctrls,
+ unsigned int xctrls_count)
{
struct uvc_control_mapping *mapping;
struct uvc_control *ctrl;
@@ -1716,6 +1718,9 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle,
u32 changes = V4L2_EVENT_CTRL_CH_VALUE;
ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping);
+ if (ctrl->entity != entity)
+ continue;
+
if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS)
/* Notification will be sent from an Interrupt event. */
continue;
@@ -1954,11 +1959,12 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
uvc_ctrl_find_ctrl_idx(entity, ctrls,
err_ctrl);
goto done;
+ } else if (ret > 0 && !rollback) {
+ uvc_ctrl_send_events(handle, entity,
+ ctrls->controls, ctrls->count);
}
}
- if (!rollback)
- uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
ret = 0;
done:
mutex_unlock(&chain->ctrl_mutex);
--
2.48.1.601.g30ceb7b040-googHi Ricardo,
Thank you for the patch.
On Mon, Feb 24, 2025 at 10:34:54AM +0000, Ricardo Ribalda wrote:
> Today, when we are applying a change to entities A, B. If A succeeds and B
> fails the events for A are not sent.
>
> This change changes the code so the events for A are send right after
s/send/sent/
> they happen.
>
> Cc: stable@kernel.org
> Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events")
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index f2484f6d21c1..7d074686eef4 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -1705,7 +1705,9 @@ static bool uvc_ctrl_xctrls_has_control(const struct v4l2_ext_control *xctrls,
> }
>
> static void uvc_ctrl_send_events(struct uvc_fh *handle,
> - const struct v4l2_ext_control *xctrls, unsigned int xctrls_count)
> + struct uvc_entity *entity,
> + const struct v4l2_ext_control *xctrls,
> + unsigned int xctrls_count)
> {
> struct uvc_control_mapping *mapping;
> struct uvc_control *ctrl;
> @@ -1716,6 +1718,9 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle,
> u32 changes = V4L2_EVENT_CTRL_CH_VALUE;
>
> ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping);
> + if (ctrl->entity != entity)
> + continue;
> +
> if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS)
> /* Notification will be sent from an Interrupt event. */
> continue;
> @@ -1954,11 +1959,12 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
> uvc_ctrl_find_ctrl_idx(entity, ctrls,
> err_ctrl);
> goto done;
> + } else if (ret > 0 && !rollback) {
> + uvc_ctrl_send_events(handle, entity,
> + ctrls->controls, ctrls->count);
> }
> }
>
> - if (!rollback)
> - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
> ret = 0;
> done:
> mutex_unlock(&chain->ctrl_mutex);
--
Regards,
Laurent Pinchart
Hi,
On 24-Feb-25 11:34, Ricardo Ribalda wrote:
> Today, when we are applying a change to entities A, B. If A succeeds and B
> fails the events for A are not sent.
>
> This change changes the code so the events for A are send right after
> they happen.
>
> Cc: stable@kernel.org
> Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events")
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index f2484f6d21c1..7d074686eef4 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -1705,7 +1705,9 @@ static bool uvc_ctrl_xctrls_has_control(const struct v4l2_ext_control *xctrls,
> }
>
> static void uvc_ctrl_send_events(struct uvc_fh *handle,
> - const struct v4l2_ext_control *xctrls, unsigned int xctrls_count)
> + struct uvc_entity *entity,
> + const struct v4l2_ext_control *xctrls,
> + unsigned int xctrls_count)
> {
> struct uvc_control_mapping *mapping;
> struct uvc_control *ctrl;
> @@ -1716,6 +1718,9 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle,
> u32 changes = V4L2_EVENT_CTRL_CH_VALUE;
>
> ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping);
> + if (ctrl->entity != entity)
> + continue;
> +
> if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS)
> /* Notification will be sent from an Interrupt event. */
> continue;
> @@ -1954,11 +1959,12 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
> uvc_ctrl_find_ctrl_idx(entity, ctrls,
> err_ctrl);
> goto done;
> + } else if (ret > 0 && !rollback) {
> + uvc_ctrl_send_events(handle, entity,
> + ctrls->controls, ctrls->count);
> }
> }
>
> - if (!rollback)
> - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
> ret = 0;
> done:
> mutex_unlock(&chain->ctrl_mutex);
>
© 2016 - 2025 Red Hat, Inc.