media: uvcvideo: Send control events for partial succeeds

commit 5c791467aea6277430da5f089b9b6c2a9d8a4af7 upstream.

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>
Message-ID: <20250224-uvc-data-backup-v2-2-de993ed9823b@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 0db6bbadc593bdb18c9743a36bccce71a71835da..2dac0eeed55b616a116322922291420189f0932e 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1429,7 +1429,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;
@@ -1440,6 +1442,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;
@@ -1638,10 +1643,11 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
                                             rollback);
                if (ret < 0)
                        goto done;
+               else if (ret > 0 && !rollback)
+                       uvc_ctrl_send_events(handle, entity, xctrls,
+                                            xctrls_count);
        }
 
-       if (!rollback)
-               uvc_ctrl_send_events(handle, xctrls, xctrls_count);
        ret = 0;
 done:
        mutex_unlock(&chain->ctrl_mutex);