diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-11-12 13:59:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:57 -0500 |
commit | 4af85668588e249d98957a41030c3a2d2acc87e5 (patch) | |
tree | 369c075151e45457b0ee2211f26a7a5cba7388bb /drivers/media/video/gspca/gspca.c | |
parent | 7ce5c41db3672c8b4419b16d9b3ac1ccf11a1445 (diff) |
V4L/DVB (13448): gspca - main: Add a gspca flag for inactive controls.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 6915db2d36db..369eddd352c3 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1158,10 +1158,13 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
1158 | } | 1158 | } |
1159 | } else { | 1159 | } else { |
1160 | ctrls = get_ctrl(gspca_dev, id); | 1160 | ctrls = get_ctrl(gspca_dev, id); |
1161 | i = ctrls - gspca_dev->sd_desc->ctrls; | ||
1161 | } | 1162 | } |
1162 | if (ctrls == NULL) | 1163 | if (ctrls == NULL) |
1163 | return -EINVAL; | 1164 | return -EINVAL; |
1164 | memcpy(q_ctrl, ctrls, sizeof *q_ctrl); | 1165 | memcpy(q_ctrl, ctrls, sizeof *q_ctrl); |
1166 | if (gspca_dev->ctrl_inac & (1 << i)) | ||
1167 | q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE; | ||
1165 | return 0; | 1168 | return 0; |
1166 | } | 1169 | } |
1167 | 1170 | ||