diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2009-12-09 22:31:21 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-28 15:02:19 -0800 |
| commit | da0297498ee0e4a73ac74beae564dc72abbe6f48 (patch) | |
| tree | d40c6ccbf8025aa251867a4d55a70b3da883089b | |
| parent | 2928b68f6294139ffbd2138440ce08efeaf23d15 (diff) | |
| download | lwn-da0297498ee0e4a73ac74beae564dc72abbe6f48.tar.gz lwn-da0297498ee0e4a73ac74beae564dc72abbe6f48.zip | |
V4L/DVB (13826): uvcvideo: Fix controls blacklisting
commit 385097e08b9c24655626ed760bc67eb7e50115a0 upstream.
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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 1b89735e62fd..4a293b444459 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -1405,7 +1405,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 || |