From 5621e13de401b23e802326d6e4ee39049034e853 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 9 Dec 2009 22:31:21 -0300 Subject: [PATCH] --- yaml --- r: 179415 b: refs/heads/master c: 385097e08b9c24655626ed760bc67eb7e50115a0 h: refs/heads/master i: 179413: 0c0c19b23d183b100ccecd0e535b396cd3cc0cf8 179411: fb68f08168a00b0cec6aafdfb58a10c93797533f 179407: 4c140a9cf43ee8a70b5bf407507d9f7be6bdcb29 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e059e6a51f12..5fb5c220e94f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1faea56087dfaf84019557f2c9ad18bd67c6012a +refs/heads/master: 385097e08b9c24655626ed760bc67eb7e50115a0 diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c index 0469d7a876a8..ec8ef8c5560a 100644 --- a/trunk/drivers/media/video/uvc/uvc_ctrl.c +++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c @@ -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 ||