Commit 829fb2dc authored Jan 16, 2011 by Hans Verkuil Committed by Mauro Carvalho Chehab Jan 19, 2011

[media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs

When queryctrl is called with a V4L2_CID_PRIVATE_BASE control ID, then
currently it is replaced by the real internal ID. This is not according to
the spec so keep the V4L2_CID_PRIVATE_BASE ID in this case.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent c959acfd

drivers/media/video/v4l2-ctrls.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1344,6 +1344,9 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler hdl, struct v4l2_queryctrl qc)

		ctrl = ref->ctrl;
		memset(qc, 0, sizeof(*qc));
		if (id >= V4L2_CID_PRIVATE_BASE)
		qc->id = id;
		else
		qc->id = ctrl->id;
		strlcpy(qc->name, ctrl->name, sizeof(qc->name));
		qc->minimum = ctrl->minimum;