Commit f4da0de6 authored by Desnes Nunes's avatar Desnes Nunes Committed by Hans Verkuil
Browse files

media: uvcvideo: Avoid variable shadowing in uvc_ctrl_cleanup_fh 



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: 10acb910 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDesnes Nunes <desnesn@redhat.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans de Goede <hansg@kernel.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent e67b5f83

drivers/media/usb/uvc/uvc_ctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -3307,7 +3307,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);
@@ -3325,7 +3324,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 i = 0; i < handle->pending_async_ctrls; i++)

		uvc_pm_put(handle->stream->dev);

}