Skip to content

Commit 364baed

Browse files
committed
media: uvcvideo: Remove redundant NULL assignment
jira LE-3622 Rebuild_History Non-Buildable kernel-6.12.0-55.22.1.el10_0 commit-author Ricardo Ribalda <ribalda@chromium.org> commit 04d3398 ctrl->handle will only be different than NULL for controls that have mappings. This is because that assignment is only done inside uvc_ctrl_set() for mapped controls. Cc: stable@vger.kernel.org Fixes: e5225c8 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives") Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Link: https://lore.kernel.org/r/20241203-uvc-fix-async-v6-2-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 04d3398) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 5f058c0 commit 364baed

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/media/usb/uvc/uvc_ctrl.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,10 +1640,8 @@ bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,
16401640
struct uvc_device *dev = chain->dev;
16411641
struct uvc_ctrl_work *w = &dev->async_ctrl;
16421642

1643-
if (list_empty(&ctrl->info.mappings)) {
1644-
ctrl->handle = NULL;
1643+
if (list_empty(&ctrl->info.mappings))
16451644
return false;
1646-
}
16471645

16481646
w->data = data;
16491647
w->urb = urb;

0 commit comments

Comments
 (0)