[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180220044425.169493-9-acourbot@chromium.org>
Date: Tue, 20 Feb 2018 13:44:12 +0900
From: Alexandre Courbot <acourbot@...omium.org>
To: Mauro Carvalho Chehab <mchehab@...nel.org>,
Hans Verkuil <hverkuil@...all.nl>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Pawel Osciak <posciak@...omium.org>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Tomasz Figa <tfiga@...omium.org>,
Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc: Gustavo Padovan <gustavo.padovan@...labora.com>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
Alexandre Courbot <acourbot@...omium.org>
Subject: [RFCv4 08/21] [WAR] v4l2-ctrls: do not clone non-standard controls
Only standard controls can be successfully cloned: handler_new_ref, used
by v4l2_ctrl_request_clone(), forcibly calls v4l2_ctrl_new_std() which
fails to find custom controls names, and we eventually hit the condition
that name == NULL in v4l2_ctrl_new().
This prevents us from using non-standard controls with requests, but
that is enough for testing purposes.
Signed-off-by: Alexandre Courbot <acourbot@...omium.org>
---
drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 166647817efb..7a81aa5959c3 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -2772,6 +2772,11 @@ int v4l2_ctrl_request_clone(struct v4l2_ctrl_handler *hdl,
if (filter && !filter(ctrl))
continue;
err = handler_new_ref(hdl, ctrl, &new_ref, false);
+ if (err) {
+ printk("%s: handler_new_ref on control %x (%s) returned %d\n", __func__, ctrl->id, ctrl->name, err);
+ err = 0;
+ continue;
+ }
if (err)
break;
if (from->is_request)
--
2.16.1.291.g4437f3f132-goog
Powered by blists - more mailing lists