Commit 072e6602 authored Mar 02, 2012 by Hans Verkuil Committed by Mauro Carvalho Chehab Mar 08, 2012

[media] v4l2-ctrls: v4l2_ctrl_add_handler should add all refs



Currently v4l2_ctrl_add_handler adds only the controls that are owned
by the handler. This is wrong. Instead all controls, whether owned or
not, should be added.

This is also implied by the v4l2-controls.txt documentation and it is
clearly the right thing to do. The only reason this was never noticed
before is because we never did this. Only recent changes in ivtv made
this error visible because there a third handler layer was added (handler
A inherits from handler B which inherits from C, D and E). Without this
change handler A only sees the controls owned by handler B and the controls
from C, D and E are missing.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 99025937

drivers/media/video/v4l2-ctrls.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1517,7 +1517,7 @@ EXPORT_SYMBOL(v4l2_ctrl_add_ctrl);
		int v4l2_ctrl_add_handler(struct v4l2_ctrl_handler *hdl,
		struct v4l2_ctrl_handler *add)
		{
		struct v4l2_ctrl *ctrl;
		struct v4l2_ctrl_ref *ref;
		int ret = 0;

		/* Do nothing if either handler is NULL or if they are the same */
		@@ -1526,7 +1526,9 @@ int v4l2_ctrl_add_handler(struct v4l2_ctrl_handler *hdl,
		if (hdl->error)
		return hdl->error;
		mutex_lock(&add->lock);
		list_for_each_entry(ctrl, &add->ctrls, node) {
		list_for_each_entry(ref, &add->ctrl_refs, node) {
		struct v4l2_ctrl *ctrl = ref->ctrl;

		/* Skip handler-private controls. */
		if (ctrl->is_private)
		continue;