From: Desnes Nunes <desnesn@redhat.com>
To: laurent.pinchart@ideasonboard.com, hansg@kernel.org
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Desnes Nunes <desnesn@redhat.com>
Subject: [PATCH] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
Date: Tue, 1 Jul 2025 11:52:40 -0300 [thread overview]
Message-ID: <20250701145240.105959-1-desnesn@redhat.com> (raw)
This avoids a variable loop shadowing occurring between the local loop
iterating through the uvc_entity's controls and the global one going
through the pending async controls of the file handle
Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
Signed-off-by: Desnes Nunes <desnesn@redhat.com>
---
drivers/media/usb/uvc/uvc_ctrl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 44b6513c5264..91cc874da798 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -3260,7 +3260,6 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
{
struct uvc_entity *entity;
- int i;
guard(mutex)(&handle->chain->ctrl_mutex);
@@ -3278,7 +3277,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
if (!WARN_ON(handle->pending_async_ctrls))
return;
- for (i = 0; i < handle->pending_async_ctrls; i++)
+ for (unsigned int j = 0; j < handle->pending_async_ctrls; j++)
uvc_pm_put(handle->stream->dev);
}
--
2.49.0
next reply other threads:[~2025-07-01 14:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-01 14:52 Desnes Nunes [this message]
2025-07-01 16:48 ` [PATCH] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh Ricardo Ribalda
2025-07-01 17:20 ` Desnes Nunes
2025-07-01 18:41 ` Laurent Pinchart
2025-07-01 19:25 ` Ricardo Ribalda
2025-07-01 19:29 ` Laurent Pinchart
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=20250701145240.105959-1-desnesn@redhat.com \
--to=desnesn@redhat.com \
--cc=hansg@kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox