From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E4994315A; Mon, 23 Jun 2025 21:41:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714919; cv=none; b=n6VWKrm4kvwrsItisNjnijypW1Uvdl8UenhoJJeVMtqKM1ULxfNloBTNiLMouiR0xe9XSeyztw0wRVd2MjJw0gOT74XLxxHzdK7ME0+4Pcg6QKFgk4B4ndHUMylUI827bmN1P43B6dbiKwBu3GKXAyYdiD8nnsxVUaL4CBoEDAk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714919; c=relaxed/simple; bh=Bx7kDJyX3Ncq1L9BPzWa69eQ+Re/1XRqB0xVJnidWTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EB6vwhvFjmAwBpwxl6xp2HPDb4Zfzsj9keGAjcsdCiKTRr4xbeZeadJnYfdDfaBr+ST05EjN/+63yms+KqLB4Jvy0iw5BWCWHhxm3Mou8jMtWROEJxJyAozhSBAHOXaV5eGTtl30iBff8zMS972Vu2ZRgeUKXoqEUOSmj4W4mac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ibgDGz54; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ibgDGz54" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE28DC4CEF1; Mon, 23 Jun 2025 21:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714919; bh=Bx7kDJyX3Ncq1L9BPzWa69eQ+Re/1XRqB0xVJnidWTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ibgDGz54HfmghGABMmn59kwiBNb+pwVkncSPzrV9/ATCKJ+aEyt0DgtyHykiVuwnX 8wfh662gWngtBbDoKk5EPD7gerE8BoNFqXLXCnhyVGo9y2K5xFyJTVYeP1lH8PS0Pc ek2YpuRYBdL8kJxGwGNiXLoI+OfHbgKMXfCjnNYE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Laurent Pinchart , Ricardo Ribalda , Hans de Goede , Hans Verkuil Subject: [PATCH 5.15 217/411] media: uvcvideo: Return the number of processed controls Date: Mon, 23 Jun 2025 15:06:01 +0200 Message-ID: <20250623130639.128307520@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo Ribalda 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: b4012002f3a3 ("[media] uvcvideo: Add support for control events") Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Message-ID: <20250224-uvc-data-backup-v2-1-de993ed9823b@chromium.org> Signed-off-by: Hans de Goede Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/uvc/uvc_ctrl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1679,12 +1679,17 @@ int uvc_ctrl_begin(struct uvc_video_chai 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, struct uvc_fh *handle, struct uvc_entity *entity, int rollback, struct uvc_control **err_ctrl) { + unsigned int processed_ctrls = 0; struct uvc_control *ctrl; unsigned int i; int ret; @@ -1718,6 +1723,9 @@ static int uvc_ctrl_commit_entity(struct else ret = 0; + if (!ret) + processed_ctrls++; + if (rollback || ret < 0) memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), @@ -1736,7 +1744,7 @@ static int uvc_ctrl_commit_entity(struct uvc_ctrl_set_handle(handle, ctrl, handle); } - return 0; + return processed_ctrls; } static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, @@ -1783,6 +1791,7 @@ int __uvc_ctrl_commit(struct uvc_fh *han if (!rollback) uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); + ret = 0; done: mutex_unlock(&chain->ctrl_mutex); return ret;