aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-controls.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx18/cx18-controls.c')
-rw-r--r--drivers/media/video/cx18/cx18-controls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index 01ba9ca37d09..855313359370 100644
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -92,11 +92,13 @@ int cx18_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qctrl)
92 92
93int cx18_querymenu(struct file *file, void *fh, struct v4l2_querymenu *qmenu) 93int cx18_querymenu(struct file *file, void *fh, struct v4l2_querymenu *qmenu)
94{ 94{
95 struct cx18 *cx = ((struct cx18_open_id *)fh)->cx;
95 struct v4l2_queryctrl qctrl; 96 struct v4l2_queryctrl qctrl;
96 97
97 qctrl.id = qmenu->id; 98 qctrl.id = qmenu->id;
98 cx18_queryctrl(file, fh, &qctrl); 99 cx18_queryctrl(file, fh, &qctrl);
99 return v4l2_ctrl_query_menu(qmenu, &qctrl, cx2341x_ctrl_get_menu(qmenu->id)); 100 return v4l2_ctrl_query_menu(qmenu, &qctrl,
101 cx2341x_ctrl_get_menu(&cx->params, qmenu->id));
100} 102}
101 103
102int cx18_s_ctrl(struct file *file, void *fh, struct v4l2_control *vctrl) 104int cx18_s_ctrl(struct file *file, void *fh, struct v4l2_control *vctrl)