diff options
| author | Hans Verkuil | 2008-08-08 17:43:59 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-10-12 13:36:48 +0200 |
| commit | e281db5862743dbe1dab7f8fb423e699537036ee (patch) | |
| tree | ef1e74bc538cd820d5ae2f64728a7388f7666a69 /drivers/media/video/v4l2-common.c | |
| parent | V4L/DVB (8637): v4l2: add v4l2_ctrl_query_menu_valid_items support function (diff) | |
| download | kernel-qcow2-linux-e281db5862743dbe1dab7f8fb423e699537036ee.tar.gz kernel-qcow2-linux-e281db5862743dbe1dab7f8fb423e699537036ee.tar.xz kernel-qcow2-linux-e281db5862743dbe1dab7f8fb423e699537036ee.zip | |
V4L/DVB (8639): saa6752hs: cleanup and add AC-3 support
Cleaned up the saa6752hs i2c driver.
Add AC-3 support.
Add VIDIOC_CHIP_IDENT support.
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index a523af78bdb1..0c511839f7ee 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -637,13 +637,17 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl) EXPORT_SYMBOL(v4l2_ctrl_query_fill_std); /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and - the menu. The qctrl pointer may be NULL, in which case it is ignored. */ + the menu. The qctrl pointer may be NULL, in which case it is ignored. + If menu_items is NULL, then the menu items are retrieved using + v4l2_ctrl_get_menu. */ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, const char **menu_items) { int i; qmenu->reserved = 0; + if (menu_items == NULL) + menu_items = v4l2_ctrl_get_menu(qmenu->id); if (menu_items == NULL || (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum))) return -EINVAL; |