media: v4l2-ctrls: allow V4L2_CTRL_TYPE_BUTTON with request api

remove check for V4L2_CTRL_TYPE_BUTTON from
v4l2_ctrl_request_clone and v4l2_ctrl_request_setup().

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index bd7f330c941c4024772deaf3a921075e50c5caf1..ad47d00e28d609dd0dc3fe40049ea779b9b53d61 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -3363,9 +3363,6 @@ static int v4l2_ctrl_request_clone(struct v4l2_ctrl_handler *hdl,
                /* Skip refs inherited from other devices */
                if (ref->from_other_dev)
                        continue;
-               /* And buttons */
-               if (ctrl->type == V4L2_CTRL_TYPE_BUTTON)
-                       continue;
                err = handler_new_ref(hdl, ctrl, &new_ref, false, true);
                if (err)
                        break;
@@ -4447,8 +4444,7 @@ int v4l2_ctrl_request_setup(struct media_request *req,
                 * Skip if this control was already handled by a cluster.
                 * Skip button controls and read-only controls.
                 */
-               if (ref->req_done || ctrl->type == V4L2_CTRL_TYPE_BUTTON ||
-                   (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY))
+               if (ref->req_done || (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY))
                        continue;
 
                v4l2_ctrl_lock(master);