[PATCH v7 16/17] media: uvcvideo: Set error_idx during ctrl_commit errors

[Ricardo Ribalda]

If we have an error setting a control, return the affected control in
the error_idx field.

Signed-off-by: Ricardo Ribalda <riba...@chromium.org>
---
 drivers/media/usb/uvc/uvc_ctrl.c | 37 ++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index fb8155ca0c0d..a5dc49e14aea 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1614,7 +1614,7 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain)
 }
 
 static int uvc_ctrl_commit_entity(struct uvc_device *dev,
-       struct uvc_entity *entity, int rollback)
+       struct uvc_entity *entity, int rollback, struct uvc_control **err_ctrl)
 {
        struct uvc_control *ctrl;
        unsigned int i;
@@ -1656,23 +1656,49 @@ static int uvc_ctrl_commit_entity(struct uvc_device 
*dev,
 
                ctrl->dirty = 0;
 
-               if (ret < 0)
+               if (ret < 0) {
+                       if (err_ctrl)
+                               *err_ctrl = ctrl;
                        return ret;
+               }
        }
 
        return 0;
 }
 
+static int uvc_ctrl_find_ctrlidx(struct uvc_entity *entity,
+                                struct v4l2_ext_controls *ctrls,
+                                struct uvc_control *uvc_control)
+{
+       struct uvc_control_mapping *mapping;
+       struct uvc_control *ctrl_found;
+       unsigned int i;
+
+       if (!entity)
+               return ctrls->count;
+
+       for (i = 0; i < ctrls->count; i++) {
+               __uvc_find_control(entity, ctrls->controls[i].id, &mapping,
+                                  &ctrl_found, 0);
+               if (uvc_control == ctrl_found)
+                       return i;
+       }
+
+       return ctrls->count;
+}
+
 int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
                      struct v4l2_ext_controls *ctrls)
 {
        struct uvc_video_chain *chain = handle->chain;
+       struct uvc_control *err_ctrl;
        struct uvc_entity *entity;
        int ret = 0;
 
        /* Find the control. */
        list_for_each_entry(entity, &chain->entities, chain) {
-               ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback);
+               ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback,
+                                            &err_ctrl);
                if (ret < 0)
                        goto done;
        }
@@ -1680,6 +1706,9 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
        if (!rollback)
                uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
 done:
+       if (ret < 0 && ctrls)
+               ctrls->error_idx = uvc_ctrl_find_ctrlidx(entity, ctrls,
+                                                        err_ctrl);
        mutex_unlock(&chain->ctrl_mutex);
        return ret;
 }
@@ -2137,7 +2166,7 @@ int uvc_ctrl_restore_values(struct uvc_device *dev)
                        ctrl->dirty = 1;
                }
 
-               ret = uvc_ctrl_commit_entity(dev, entity, 0);
+               ret = uvc_ctrl_commit_entity(dev, entity, 0, NULL);
                if (ret < 0)
                        return ret;
        }
-- 
2.31.0.rc2.261.g7f71774620-goog