From patchwork Fri Mar 19 17:08:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 405092 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A871C433E0 for ; Fri, 19 Mar 2021 17:10:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E059061988 for ; Fri, 19 Mar 2021 17:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230292AbhCSRJn (ORCPT ); Fri, 19 Mar 2021 13:09:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230228AbhCSRJN (ORCPT ); Fri, 19 Mar 2021 13:09:13 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5360FC06175F for ; Fri, 19 Mar 2021 10:09:13 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id w18so11679188edc.0 for ; Fri, 19 Mar 2021 10:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=96ZVVsI7mmV0nt1s7KCaw3tkEc80+53xafrWhnUjtVQ=; b=Z9doXzuIiBbNBO8RqTWEs5V3LjQI9z2+BiDjEv7qTAQ0GXyOAgHcFeMx09EYCUZI2h T2aFsyRvNpAjddosGgaH1ou4YZCtczgVSEd8sBUqfHZsJG+oDjOWDJo7jmZOQDJGoRV0 EGX3rw8KVo7JkWRw9+QCa7U7PaboFU3gLZ/3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=96ZVVsI7mmV0nt1s7KCaw3tkEc80+53xafrWhnUjtVQ=; b=nGh0kalIg1O8F4dLkx7bbD/ugrz1bsIDWFZnmgnI5x+aKuSBYQS6Q7mHRhSjWzO5RO 91RhxUtqqBKzGAnP8A/dVumEZZGcVJUzieLx+cmignk+BjS/iGsOUTnkyPmkHoCaeVx9 fAjAyjHVneKLCTAydduGHEvR3zjWCKUPxqxf1BHZABBwn85F0c3lwB5gYzw2H8TqTc0p umPASMjo8NhCksyi8uqZ4S3mD1Q93ofgu7xBJn6R5sabjbk6EO69kbDcRnaDcsLrUebK woLxXoCYe9w/sCpnpEun2BKJITgaDQXxzouoZ5+E5aHWcyJ7IYeQ14GkdpqXcYQzEG2o nGmA== X-Gm-Message-State: AOAM530zGksmd5caShmsiP9Jyj1+hwhcyFGklaeIA3viKZleoPo4VYIQ VS9d9s00biRJRCO7ZNcwUDtBAA== X-Google-Smtp-Source: ABdhPJzvvbR8fKsxzgOGmrSXuSZkwip+jYiYDlT1msC+cn/rWgWLm7xa9w+XULjRkaUzhfcfJdrJiQ== X-Received: by 2002:a05:6402:13ce:: with SMTP id a14mr10809525edx.365.1616173751980; Fri, 19 Mar 2021 10:09:11 -0700 (PDT) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id be27sm4506050edb.47.2021.03.19.10.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 10:09:11 -0700 (PDT) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Sergey Senozhatsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, tfiga@chromium.org Cc: Ricardo Ribalda Subject: [PATCH v8 04/19] media: v4l2-ioctl: S_CTRL output the right value Date: Fri, 19 Mar 2021 18:08:51 +0100 Message-Id: <20210319170906.278238-5-ribalda@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319170906.278238-1-ribalda@chromium.org> References: <20210319170906.278238-1-ribalda@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If the driver does not implement s_ctrl, but it does implement s_ext_ctrls, we convert the call. When that happens we have also to convert back the response from s_ext_ctrls. Fixes v4l2_compliance: Control ioctls (Input 0): fail: v4l2-test-controls.cpp(411): returned control value out of range fail: v4l2-test-controls.cpp(507): invalid control 00980900 test VIDIOC_G/S_CTRL: FAIL Fixes: 35ea11ff8471 ("V4L/DVB (8430): videodev: move some functions from v4l2-dev.h to v4l2-common.h or v4l2-ioctl.h") Signed-off-by: Ricardo Ribalda Reviewed-by: Hans Verkuil --- drivers/media/v4l2-core/v4l2-ioctl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 7b5ebdd329e8..b8f73a48872b 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -2266,6 +2266,7 @@ static int v4l_s_ctrl(const struct v4l2_ioctl_ops *ops, test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL; struct v4l2_ext_controls ctrls; struct v4l2_ext_control ctrl; + int ret; if (vfh && vfh->ctrl_handler) return v4l2_s_ctrl(vfh, vfh->ctrl_handler, p); @@ -2281,9 +2282,11 @@ static int v4l_s_ctrl(const struct v4l2_ioctl_ops *ops, ctrls.controls = &ctrl; ctrl.id = p->id; ctrl.value = p->value; - if (check_ext_ctrls(&ctrls, VIDIOC_S_CTRL)) - return ops->vidioc_s_ext_ctrls(file, fh, &ctrls); - return -EINVAL; + if (!check_ext_ctrls(&ctrls, VIDIOC_S_CTRL)) + return -EINVAL; + ret = ops->vidioc_s_ext_ctrls(file, fh, &ctrls); + p->value = ctrl.value; + return ret; } static int v4l_g_ext_ctrls(const struct v4l2_ioctl_ops *ops,