From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, ribalda@chromium.org
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.4.y] media: uvcvideo: Only save async fh if success
Date: Fri, 28 Feb 2025 23:20:47 -0500 [thread overview]
Message-ID: <20250228183328-4e13853b3444773c@stable.kernel.org> (raw)
In-Reply-To: <20250228080746.2658174-1-ribalda@chromium.org>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: d9fecd096f67a4469536e040a8a10bbfb665918b
Status in newer kernel trees:
6.13.y | Present (different SHA1: e515ccef73e2)
6.12.y | Present (different SHA1: 34fb9eb31d66)
6.6.y | Present (different SHA1: 08384382e1db)
6.1.y | Present (different SHA1: 050053a7c0ad)
Note: The patch differs from the upstream commit:
---
1: d9fecd096f67a ! 1: 44f5b59535218 media: uvcvideo: Only save async fh if success
@@ Commit message
Link: https://lore.kernel.org/r/20241203-uvc-fix-async-v6-1-26c867231118@chromium.org
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+ (cherry picked from commit d9fecd096f67a4469536e040a8a10bbfb665918b)
## drivers/media/usb/uvc/uvc_ctrl.c ##
@@ drivers/media/usb/uvc/uvc_ctrl.c: 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_control **err_ctrl)
+- struct uvc_entity *entity, int rollback)
+ struct uvc_fh *handle,
+ struct uvc_entity *entity,
-+ int rollback,
-+ struct uvc_control **err_ctrl)
++ int rollback)
{
struct uvc_control *ctrl;
unsigned int i;
@@ drivers/media/usb/uvc/uvc_ctrl.c: static int uvc_ctrl_commit_entity(struct uvc_device *dev,
- *err_ctrl = ctrl;
+
+ if (ret < 0)
return ret;
- }
+
+ if (!rollback && handle &&
+ ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS)
@@ drivers/media/usb/uvc/uvc_ctrl.c: int __uvc_ctrl_commit(struct uvc_fh *handle, i
/* Find the control. */
list_for_each_entry(entity, &chain->entities, chain) {
-- ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback,
-- &err_ctrl);
+- ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback);
+ ret = uvc_ctrl_commit_entity(chain->dev, handle, entity,
-+ rollback, &err_ctrl);
- if (ret < 0) {
- if (ctrls)
- ctrls->error_idx =
++ rollback);
+ if (ret < 0)
+ goto done;
+ }
@@ drivers/media/usb/uvc/uvc_ctrl.c: int uvc_ctrl_set(struct uvc_fh *handle,
mapping->set(mapping, value,
uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT));
@@ drivers/media/usb/uvc/uvc_ctrl.c: int uvc_ctrl_restore_values(struct uvc_device
ctrl->dirty = 1;
}
-- ret = uvc_ctrl_commit_entity(dev, entity, 0, NULL);
-+ ret = uvc_ctrl_commit_entity(dev, NULL, entity, 0, NULL);
+- ret = uvc_ctrl_commit_entity(dev, entity, 0);
++ ret = uvc_ctrl_commit_entity(dev, NULL, entity, 0);
if (ret < 0)
return ret;
}
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
prev parent reply other threads:[~2025-03-01 4:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-10 15:12 FAILED: patch "[PATCH] media: uvcvideo: Only save async fh if success" failed to apply to 5.4-stable tree gregkh
2025-02-28 8:07 ` [PATCH 5.4.y] media: uvcvideo: Only save async fh if success Ricardo Ribalda
2025-03-01 4:20 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250228183328-4e13853b3444773c@stable.kernel.org \
--to=sashal@kernel.org \
--cc=ribalda@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.