aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-controls.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-06-22 11:03:28 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:11:55 -0400
commite0e31cdb91cddc4cfbf6d5ffa8212f694723269b (patch)
tree50f2c336f17c5fe9f24dff0e6eb172223892ecc6 /drivers/media/video/ivtv/ivtv-controls.c
parent37f89f9542c3945bddf46efc15a1b1e349af3f88 (diff)
V4L/DVB (8105): cx2341x: add TS capability
The cx18 can support transport streams with newer firmwares. Add a TS capability to the generic cx2341x module. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-controls.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-controls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c
index 2df9b0668f1f..6a5b70912959 100644
--- a/drivers/media/video/ivtv/ivtv-controls.c
+++ b/drivers/media/video/ivtv/ivtv-controls.c
@@ -89,11 +89,13 @@ int ivtv_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qctrl)
89 89
90int ivtv_querymenu(struct file *file, void *fh, struct v4l2_querymenu *qmenu) 90int ivtv_querymenu(struct file *file, void *fh, struct v4l2_querymenu *qmenu)
91{ 91{
92 struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
92 struct v4l2_queryctrl qctrl; 93 struct v4l2_queryctrl qctrl;
93 94
94 qctrl.id = qmenu->id; 95 qctrl.id = qmenu->id;
95 ivtv_queryctrl(file, fh, &qctrl); 96 ivtv_queryctrl(file, fh, &qctrl);
96 return v4l2_ctrl_query_menu(qmenu, &qctrl, cx2341x_ctrl_get_menu(qmenu->id)); 97 return v4l2_ctrl_query_menu(qmenu, &qctrl,
98 cx2341x_ctrl_get_menu(&itv->params, qmenu->id));
97} 99}
98 100
99int ivtv_s_ctrl(struct file *file, void *fh, struct v4l2_control *vctrl) 101int ivtv_s_ctrl(struct file *file, void *fh, struct v4l2_control *vctrl)