diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-08-11 17:47:18 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 11:19:17 -0400 |
| commit | 6b5a9492ca0c991bab1ac495624e17520e9edf18 (patch) | |
| tree | 4ee2bc89d42ceae84989df965ce426932d3a6fbe /drivers/media/video/v4l2-common.c | |
| parent | a138ebcf826b9cbf6683e1db25905d7cd89e2dd1 (diff) | |
V4L/DVB (12543): v4l: introduce string control support.
The upcoming RDS encoder needs support for string controls. This patch
implements the core implementation.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-common.c')
| -rw-r--r-- | drivers/media/video/v4l2-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index b91d66a767d7..536150c34067 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
| @@ -156,6 +156,8 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, | |||
| 156 | return -EINVAL; | 156 | return -EINVAL; |
| 157 | if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED) | 157 | if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED) |
| 158 | return -EBUSY; | 158 | return -EBUSY; |
| 159 | if (qctrl->type == V4L2_CTRL_TYPE_STRING) | ||
| 160 | return 0; | ||
| 159 | if (qctrl->type == V4L2_CTRL_TYPE_BUTTON || | 161 | if (qctrl->type == V4L2_CTRL_TYPE_BUTTON || |
| 160 | qctrl->type == V4L2_CTRL_TYPE_INTEGER64 || | 162 | qctrl->type == V4L2_CTRL_TYPE_INTEGER64 || |
| 161 | qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS) | 163 | qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS) |