diff options
| author | Andy Voltz <andy.voltz@timesys.com> | 2010-11-15 16:00:38 -0500 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2010-11-17 11:30:34 -0500 |
| commit | 2e0ae4bf137e282e825b27b02eb46f86c59d004e (patch) | |
| tree | 7c2534acd757ca414f02c5b983ee67eb2b2493c6 /drivers/media/video/uvc/uvc_ctrl.c | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Bump Linux kernel to 2.6.32.25
Diffstat (limited to 'drivers/media/video/uvc/uvc_ctrl.c')
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 1b89735e62fd..0ca39ec4ba8e 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -826,6 +826,13 @@ int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, ret = 0; goto out; + case V4L2_CTRL_TYPE_BUTTON: + v4l2_ctrl->minimum = 0; + v4l2_ctrl->maximum = 0; + v4l2_ctrl->step = 0; + ret = 0; + goto out; + default: break; } @@ -1405,7 +1412,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 || |