From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6756125C822 for ; Wed, 25 Jun 2025 12:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750855159; cv=none; b=a2igyu1UiNDbcsnznaTic1tByUuOkNXNhi6B/QtfQOlFI7QATn2aXBtaBdfauNgTttxy0H3SapDmvP/chORWgAzF+kTE86JGErCEbZ2gQqonzJ0yIhQxiS0SNYSvrWL6CRRmtLaF/e8y36K88ddna/YIs2caBeN0He6hRIoaqEk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750855159; c=relaxed/simple; bh=E5QYcSRaYJOrl/fXuZXx6yL3m9If26EgFVf8FuImJBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D32xnpmFY2RICWBeOEAucsd+qNGzNGY3EFYjKm0untHjWUJW/RQWQmM/cnRK0Jz9kUBYc5tvfAqPIgtWk9VjLm3ASThXcRbrqg+bxWChu+Kp2vzOZuKAK/sX9JpAxXYmQB3nZnj7D/GRcIwfw0iEDZzMCOoIpev54WVqHUJ9kvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=GtaVrEI4; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="GtaVrEI4" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-553b60de463so7096849e87.3 for ; Wed, 25 Jun 2025 05:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750855155; x=1751459955; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R7GmNOmy9WQWIK2CqMeu6/jsFxGFLOmm1tWGmRkmrrk=; b=GtaVrEI4qoMnZb0Z5NmAHXdFfnMS6RFnUMxMVKUvh1jYvbGfysYGBh2Dy1CsJKf/AA D24DxojrvbnW9uhFiuFFwrBLfV+SMmKTtJeJ1vvOUDjGfqdrC/thYooDfxjr+iJuH06x lh9T1XnDyHM8D19xgmGjUxJPIRl8UIPvrh5Qs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750855155; x=1751459955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R7GmNOmy9WQWIK2CqMeu6/jsFxGFLOmm1tWGmRkmrrk=; b=odjee0DAutuKoXJrXc432IIfm9ynt3H3BqEWBLCbM4bWYfT5xTpIeJXiczmOiWW+er b2eYtNNXWNHkwiIfG6f2FP2RskDcU3ueuspZxSH0ZSjKW0OhhqnE/xbFuZC/zarEx+74 PCKxfgDkAmp0V2KlikAJFKsZE1zp95dlRp/pliLgkJE/a9dgD5Rt53b5dMrolR0mbu9P ncJQXDmBllEY8T/NgdXVnLMetqFSzwhIAlo2vj2NQnpOhcmWPS8y9IgpE2TCCsbhGDZt T4Ti4KjdxQNq12+D0O3aTZokpBgoSWsUN3vdkNrFCnkmR6JD1bg5LYi5V9GbxFE0Iv76 Wpuw== X-Gm-Message-State: AOJu0YwM2Gndv6QHgE09H12jlzo8aTqe9+JOqlYveKzJ8eFsyhiYLXnR R8l7e3OANdk7Ar1sZLoP8xA+gNxs4ZXisMZUygC1nz2POT/REBq33yjgyO5sHnGJHk17v2obteg 4hh0= X-Gm-Gg: ASbGncs8dfMoaNwqYn3jZl5wmy4F8opaEcrlitmELbEBtaPAGMkmVxom39xHsiSQ3Ib Nc7KgRb8IgndJVTWY35b5XWzKRpkMeePf6rR/ZCT+lj6AK3h0Qx0UL5OOJkGqVkDaTWyKDRIOvB gT0SFAt6lhuaCYfSkVqoxmX5C7sVoAn0TedJIhjFlbJz4tWGTjTg40IJ2Z0HhR5AkkAkUyIMI2q EIfbuucQVFK4LCWrIZZzFL1WZ/ULHRa+fSTBivozf/jluRf/3sF5oEk018ExJz+acZO2g6FlG8e h3/3peQ4ys+/J/ix9zjmqdt7fQRYmlVEJIS8fEPM0xIHTBwspY23p+tbU9q+x5Nvs64blzW08KG io/u12GYpk3E7YehDnWpy59AXIMu6lxNRAg0K8Aeah5WF+6U= X-Google-Smtp-Source: AGHT+IGPVpbpQR9TOpKufOhqTiUxL8dkvbpxsQumUcfyY7D7JWm8ek0tqWRSfykvYl5UlQdYsVrQrg== X-Received: by 2002:a05:6512:3b87:b0:553:2e3a:bae with SMTP id 2adb3069b0e04-554fdd405f2mr725957e87.39.1750855154945; Wed, 25 Jun 2025 05:39:14 -0700 (PDT) Received: from ribalda.c.googlers.com.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553e40dcde5sm2187710e87.0.2025.06.25.05.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 05:39:14 -0700 (PDT) From: Ricardo Ribalda To: stable@vger.kernel.org Cc: Ricardo Ribalda , stable@kernel.org, Laurent Pinchart , Hans de Goede , Hans Verkuil Subject: [PATCH 6.12.y 1/3] media: uvcvideo: Return the number of processed controls Date: Wed, 25 Jun 2025 12:39:05 +0000 Message-ID: <20250625123907.523404-1-ribalda@chromium.org> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog In-Reply-To: <2025062014-afternoon-selector-f71a@gregkh> References: <2025062014-afternoon-selector-f71a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit ba4fafb02ad6a4eb2e00f861893b5db42ba54369) --- drivers/media/usb/uvc/uvc_ctrl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 58d1bc80253e..3030e5a893e2 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1830,12 +1830,17 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain) 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; @@ -1870,6 +1875,9 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, 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), @@ -1888,7 +1896,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, uvc_ctrl_set_handle(handle, ctrl, handle); } - return 0; + return processed_ctrls; } static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, @@ -1935,6 +1943,7 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, if (!rollback) uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); + ret = 0; done: mutex_unlock(&chain->ctrl_mutex); return ret; -- 2.50.0.727.gbf7dc18ff4-goog