[PATCH] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh

From: Desnes Nunes
Date: Tue Jul 01 2025 - 10:59:34 EST


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@xxxxxxxxxx>
---
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