Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385097e0 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13826): uvcvideo: Fix controls blacklisting 



The control blacklisting code erroneously used usb_match_id() by passing
a pointer to a usb_device_id structure instead of an array of such
structures.

Replace the usb_match_id() call by usb_match_id_one().

Thanks to Paulo Assis for diagnosing the bug and providing an initial
fix.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1faea560

drivers/media/video/uvc/uvc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -1393,7 +1393,7 @@ uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity) 
	size = entity->processing.bControlSize;



	for (i = 0; i < ARRAY_SIZE(blacklist); ++i) {

		if (!usb_match_id(dev->intf, &blacklist[i].id))

		if (!usb_match_one_id(dev->intf, &blacklist[i].id))

			continue;



		if (blacklist[i].index >= 8 * size ||