diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 11:43:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:48 -0400 |
commit | e281db5862743dbe1dab7f8fb423e699537036ee (patch) | |
tree | ef1e74bc538cd820d5ae2f64728a7388f7666a69 /drivers/media/video/v4l2-common.c | |
parent | 1e55126666944c83bf98243564e25302f363e2a4 (diff) |
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) | |||
637 | EXPORT_SYMBOL(v4l2_ctrl_query_fill_std); | 637 | EXPORT_SYMBOL(v4l2_ctrl_query_fill_std); |
638 | 638 | ||
639 | /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and | 639 | /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and |
640 | the menu. The qctrl pointer may be NULL, in which case it is ignored. */ | 640 | the menu. The qctrl pointer may be NULL, in which case it is ignored. |
641 | If menu_items is NULL, then the menu items are retrieved using | ||
642 | v4l2_ctrl_get_menu. */ | ||
641 | int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, | 643 | int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, |
642 | const char **menu_items) | 644 | const char **menu_items) |
643 | { | 645 | { |
644 | int i; | 646 | int i; |
645 | 647 | ||
646 | qmenu->reserved = 0; | 648 | qmenu->reserved = 0; |
649 | if (menu_items == NULL) | ||
650 | menu_items = v4l2_ctrl_get_menu(qmenu->id); | ||
647 | if (menu_items == NULL || | 651 | if (menu_items == NULL || |
648 | (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum))) | 652 | (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum))) |
649 | return -EINVAL; | 653 | return -EINVAL; |