media: v4l2-ctrls: show all owned controls in log_status

VIDIOC_LOG_STATUS will log the controls owned by the driver. But the
code didn't take into account the case where a single driver creates
multiple control handlers. A good example is the vivid driver, but
others use it as well.

Modify v4l2_ctrl_handler_log_status() so that it really shows all
controls owned by this driver.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
index a662fb60f73f42166b53c983a6468a948f6b4d3e..0accb96001db07a7d4a5835c7cebf3536f0f1eba 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
@@ -2503,7 +2503,8 @@ int v4l2_ctrl_handler_setup(struct v4l2_ctrl_handler *hdl)
 EXPORT_SYMBOL(v4l2_ctrl_handler_setup);
 
 /* Log the control name and value */
-static void log_ctrl(const struct v4l2_ctrl *ctrl,
+static void log_ctrl(const struct v4l2_ctrl_handler *hdl,
+                    struct v4l2_ctrl *ctrl,
                     const char *prefix, const char *colon)
 {
        if (ctrl->flags & (V4L2_CTRL_FLAG_DISABLED | V4L2_CTRL_FLAG_WRITE_ONLY))
@@ -2513,7 +2514,11 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
 
        pr_info("%s%s%s: ", prefix, colon, ctrl->name);
 
+       if (ctrl->handler != hdl)
+               v4l2_ctrl_lock(ctrl);
        ctrl->type_ops->log(ctrl);
+       if (ctrl->handler != hdl)
+               v4l2_ctrl_unlock(ctrl);
 
        if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE |
                           V4L2_CTRL_FLAG_GRABBED |
@@ -2532,7 +2537,7 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
 void v4l2_ctrl_handler_log_status(struct v4l2_ctrl_handler *hdl,
                                  const char *prefix)
 {
-       struct v4l2_ctrl *ctrl;
+       struct v4l2_ctrl_ref *ref;
        const char *colon = "";
        int len;
 
@@ -2544,9 +2549,12 @@ void v4l2_ctrl_handler_log_status(struct v4l2_ctrl_handler *hdl,
        if (len && prefix[len - 1] != ' ')
                colon = ": ";
        mutex_lock(hdl->lock);
-       list_for_each_entry(ctrl, &hdl->ctrls, node)
-               if (!(ctrl->flags & V4L2_CTRL_FLAG_DISABLED))
-                       log_ctrl(ctrl, prefix, colon);
+       list_for_each_entry(ref, &hdl->ctrl_refs, node) {
+               if (ref->from_other_dev ||
+                   (ref->ctrl->flags & V4L2_CTRL_FLAG_DISABLED))
+                       continue;
+               log_ctrl(hdl, ref->ctrl, prefix, colon);
+       }
        mutex_unlock(hdl->lock);
 }
 EXPORT_SYMBOL(v4l2_ctrl_handler_log_status);