summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-common.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-08-11 18:47:18 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 12:19:17 -0300
commit6b5a9492ca0c991bab1ac495624e17520e9edf18 (patch)
tree4ee2bc89d42ceae84989df965ce426932d3a6fbe /drivers/media/video/v4l2-common.c
parenta138ebcf826b9cbf6683e1db25905d7cd89e2dd1 (diff)
downloadlinux-6b5a9492ca0c991bab1ac495624e17520e9edf18.tar.gz
linux-6b5a9492ca0c991bab1ac495624e17520e9edf18.tar.bz2
linux-6b5a9492ca0c991bab1ac495624e17520e9edf18.zip
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.c2
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,
return -EINVAL;
if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED)
return -EBUSY;
+ if (qctrl->type == V4L2_CTRL_TYPE_STRING)
+ return 0;
if (qctrl->type == V4L2_CTRL_TYPE_BUTTON ||
qctrl->type == V4L2_CTRL_TYPE_INTEGER64 ||
qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)