projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.1-rc2' into HEAD
[cascardo/linux.git]
/
drivers
/
media
/
video
/
v4l2-common.c
diff --git
a/drivers/media/video/v4l2-common.c
b/drivers/media/video/v4l2-common.c
index
06b9f9f
..
5c6100f
100644
(file)
--- a/
drivers/media/video/v4l2-common.c
+++ b/
drivers/media/video/v4l2-common.c
@@
-105,6
+105,9
@@
int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
menu_items[ctrl->value][0] == '\0')
return -EINVAL;
}
+ if (qctrl->type == V4L2_CTRL_TYPE_BITMASK &&
+ (ctrl->value & ~qctrl->maximum))
+ return -ERANGE;
return 0;
}
EXPORT_SYMBOL(v4l2_ctrl_check);