samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: uvcvideo: Return the number of processed controls

Browse Source 
commit ba4fafb02ad6a4eb2e00f861893b5db42ba54369 upstream.

If we let know our callers that we have not done anything, they will be
able to optimize their decisions.

Cc: stable@kernel.org
Fixes: b4012002f3 ("[media] uvcvideo: Add support for control events")
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Message-ID: <20250224-uvc-data-backup-v2-1-de993ed9823b@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ricardo Ribalda
2025-02-24 10:34:53 +00:00
committed by Greg Kroah-Hartman
parent ec26be7d63
commit d314f99b6f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/usb/uvc/uvc_ctrl.c
View File

@@ -1783,12 +1783,17 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain)
return mutex_lock_interruptible(&chain->ctrl_mutex) ? -ERESTARTSYS : 0; return mutex_lock_interruptible(&chain->ctrl_mutex) ? -ERESTARTSYS : 0;
} }
/*
* Returns the number of uvc controls that have been correctly set, or a
* negative number if there has been an error.
*/
static int uvc_ctrl_commit_entity(struct uvc_device *dev, static int uvc_ctrl_commit_entity(struct uvc_device *dev,
struct uvc_fh *handle, struct uvc_fh *handle,
struct uvc_entity *entity, struct uvc_entity *entity,
int rollback, int rollback,
struct uvc_control **err_ctrl) struct uvc_control **err_ctrl)
{ {
unsigned int processed_ctrls = 0;
struct uvc_control *ctrl; struct uvc_control *ctrl;
unsigned int i; unsigned int i;
int ret; int ret;
@@ -1823,6 +1828,9 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
else else
ret = 0; ret = 0;
if (!ret)
processed_ctrls++;
if (rollback || ret < 0) if (rollback || ret < 0)
memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT),
uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP),
@@ -1841,7 +1849,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
uvc_ctrl_set_handle(handle, ctrl, handle); uvc_ctrl_set_handle(handle, ctrl, handle);
} }
return 0; return processed_ctrls;
} }
static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity,
@@ -1888,6 +1896,7 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
if (!rollback) if (!rollback)
uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
ret = 0;
done: done:
mutex_unlock(&chain->ctrl_mutex); mutex_unlock(&chain->ctrl_mutex);
return ret; return ret;