From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 60665C47094 for ; Thu, 10 Jun 2021 16:23:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 486D3613E7 for ; Thu, 10 Jun 2021 16:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231277AbhFJQZg (ORCPT ); Thu, 10 Jun 2021 12:25:36 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:47460 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231243AbhFJQZb (ORCPT ); Thu, 10 Jun 2021 12:25:31 -0400 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0D7628D4; Thu, 10 Jun 2021 18:23:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1623342213; bh=MZnu7jeHkrOC9ykNYM9T9iwN0lLDKaGxg+GIuh8egJk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uKJvScU2kYUtm1Pqx88BCeAjDhFsgZ04IksyqaFWp2HNwIQLU0sJjCzQUkSBD0iWj Ar4/e8abXLgxhOWJDv6OJF7e6u8T4rSizDgjZZHHJ+p6depJSGjJsCXLwFH+rFsqbX Q0p+T6TWUKapKsNZg6hlHavy76nm94COIK99bI2U= Date: Thu, 10 Jun 2021 19:23:14 +0300 From: Laurent Pinchart To: Ricardo Ribalda Cc: Mauro Carvalho Chehab , Hans Verkuil , Sergey Senozhatsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, tfiga@chromium.org Subject: Re: [PATCH v9 04/22] media: v4l2-ioctl: S_CTRL output the right value Message-ID: References: <20210326095840.364424-1-ribalda@chromium.org> <20210326095840.364424-5-ribalda@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210326095840.364424-5-ribalda@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ricardo, Thank you for the patch. On Fri, Mar 26, 2021 at 10:58:22AM +0100, Ricardo Ribalda wrote: > 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") > Reviewed-by: Hans Verkuil > Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart > --- > 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, -- Regards, Laurent Pinchart