diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 17:43:59 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 17:43:59 +0200 |
| commit | 318078c04d44e4f178e788c083c76aea7180a084 (patch) | |
| tree | 2e390516bcef839c1e70833b54ec55d89644ba13 /linux/drivers/media/video/v4l2-common.c | |
| parent | 46ec16e58c40f6083e1d01480da2d34a6ff268c2 (diff) | |
| download | mediapointer-dvb-s2-318078c04d44e4f178e788c083c76aea7180a084.tar.gz mediapointer-dvb-s2-318078c04d44e4f178e788c083c76aea7180a084.tar.bz2 | |
saa6752hs: cleanup and add AC-3 support
From: Hans Verkuil <hverkuil@xs4all.nl>
Cleaned up the saa6752hs i2c driver.
Add AC-3 support.
Add VIDIOC_CHIP_IDENT support.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/v4l2-common.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index 8dfe3cb8b..0eb498a08 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -638,13 +638,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; |