On Friday, December 03, 2010 14:15:43 Laurent Pinchart wrote: > v4l2_queryctrl sets the step value based on the control type. That would > be fine if it used the control type stored in the V4L2 kernel control > object, not the one stored in the userspace ioctl structure that has > just been memset to 0. Fix this. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> Ouch! :-( Acked-by: Hans Verkuil <hverkuil@xxxxxxxxx> Regards, Hans 'Feels Embarrased' Verkuil > --- > drivers/media/video/v4l2-ctrls.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c > index 9d2502c..5f74fec0 100644 > --- a/drivers/media/video/v4l2-ctrls.c > +++ b/drivers/media/video/v4l2-ctrls.c > @@ -1338,7 +1338,7 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc) > qc->minimum = ctrl->minimum; > qc->maximum = ctrl->maximum; > qc->default_value = ctrl->default_value; > - if (qc->type == V4L2_CTRL_TYPE_MENU) > + if (ctrl->type == V4L2_CTRL_TYPE_MENU) > qc->step = 1; > else > qc->step = ctrl->step; > -- Hans Verkuil - video4linux developer - sponsored by Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
