From 52a71768b52926c7b93a9a975f4b6dff07f53e45 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 2 Mar 2012 12:41:25 -0300 Subject: [PATCH] --- yaml --- r: 295028 b: refs/heads/master c: 072e660257ee26e4f4defd836b1e1fa23d68de32 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-ctrls.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34509a47fae3..247b7ab87261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99025937bcd2291e6e50b4e54fe1f6d48d4c2b7c +refs/heads/master: 072e660257ee26e4f4defd836b1e1fa23d68de32 diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c index e6c7c8e8cc4e..88cb2c6e5d23 100644 --- a/trunk/drivers/media/video/v4l2-ctrls.c +++ b/trunk/drivers/media/video/v4l2-ctrls.c @@ -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;