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 47DE621B8F6; Mon, 23 Jun 2025 22:11:58 +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=1750716718; cv=none; b=uPweMCBU/9D8/Z9evFiGQcepNr30YN59P9sjbkewVbUcCP7FkfRzZZRn9APMotIGXfYnJe0auJLlRXJkX9gdQJgYRBLW+bgYEwVeRZbWI3zJBfGoSBzAIamc6GCp2JkasthL3y0EylPAoxaMU8MVJMIsPSpQRmL1/0Ln9NXE7l8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716718; c=relaxed/simple; bh=ekP3m3JDkx80H9/cAplLlpvM7I2VfbHto6kKp/D2qT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TmNLiR0NeWPXrIgEL+rkI8/uDRTUziR9qUhpjRKYv6A/T9QrZaJnJn4hu+bIOE0S6TRb6ea9RCDM4yBoOjj3U6RABsfIXEORE3PifHi4NqqcamOFUPe0qLIdtA8wgi1dkfI++oC6ZmmoXxr7F/lN1Qg8PyFYsXAoGXTqOH1WLYc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XGY9KmX9; 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="XGY9KmX9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAE1CC4CEEA; Mon, 23 Jun 2025 22:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716718; bh=ekP3m3JDkx80H9/cAplLlpvM7I2VfbHto6kKp/D2qT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XGY9KmX90WVxO6zzbUQYbVrB+HjWOLGftbmrmKRteitBHZJ5+ziOHjE9JASC6OCjp ZUIKAe1d47U3shfTKtxTc0+BGSN022TmcQC+WSRiDQEhgyMXsaBdcl0tmm2PAz7AM9 odBB7QW0X8HsEO79jU/g143ZN4RU8b8P70JLYSM0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Ricardo Ribalda , Hans de Goede , Hans Verkuil Subject: [PATCH 6.1 323/508] media: uvcvideo: Send control events for partial succeeds Date: Mon, 23 Jun 2025 15:06:08 +0200 Message-ID: <20250623130653.274680201@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130645.255320792@linuxfoundation.org> References: <20250623130645.255320792@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo Ribalda 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 Message-ID: <20250224-uvc-data-backup-v2-2-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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1593,7 +1593,9 @@ static bool uvc_ctrl_xctrls_has_control( } 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; @@ -1604,6 +1606,9 @@ static void uvc_ctrl_send_events(struct 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; @@ -1842,11 +1847,12 @@ int __uvc_ctrl_commit(struct uvc_fh *han uvc_ctrl_find_ctrl_idx(entity, ctrls, err_ctrl); goto done; + } else if (ret > 0 && !rollback) { + uvc_ctrl_send_events(handle, entity, + ctrls->controls, ctrls->count); } } - if (!rollback) - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); ret = 0; done: mutex_unlock(&chain->ctrl_mutex);