Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp247957rdg; Thu, 12 Oct 2023 04:48:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdwJJUfMelpF/RJ74SJFLr49Y+SgoeAzNp2NflAbcC5BrXy2KrMCnww0jW4zVOP4+8p1rV X-Received: by 2002:a17:902:ea8d:b0:1b8:2c6f:3248 with SMTP id x13-20020a170902ea8d00b001b82c6f3248mr24823697plb.39.1697111319833; Thu, 12 Oct 2023 04:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697111319; cv=none; d=google.com; s=arc-20160816; b=A8i2v/yjrUMJJpWMK2bi28SYd1miNzgwQBgSS+i3G3ii0rVDvd76CdclLpVkc3t7/P 3pCq/DROs9aqRojQibaNyuRlA7QmG5ngbXhGQM9eGYSizIcn63mROFju0skSZc5VDN3W 2l4zzKGTf4Qr57P2Xkida0k/R3uHq1C12QFV3uGRQDMpfpgglVFNA6YsLNe/id6TxxNP yh3DjMRC8hjHR2tvebpphsKc0Dyl9n6k685ni7kCEuwOgSpSTXPSLX0RG1OqbgXReuMZ I7FAtpz+qDzL0Eftn1DogKxy6ApjH8YspVYvreaenePZ8c9SO7nTKQyRmam35frJKrA2 cIQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uG4E7/r1sBt2/JHh3VW9t07bzXinx1yTa+6SpOwLc5Q=; fh=O6aRB12iLfQPcoaBoN6ND3UiYcgSMHP3FYKR6EKS/0Q=; b=KqykWHhqxNRwjMV8hS6DtcdwKkoRKyBuitOszaSyxUg8mqOIDY49Zb48bEBhrA6Foc fn87rio3bufwfI5L0mjBV0hR+yo+7l+9dcycWFkNbiPHC6wKRYySgdvmewYzFT5cOw+k PDdyxfp2dQqzft5wk+0uAoIN81m5auUO7iWqQq31TLY5Q7tOOzWQAti+wq+P31WaUIWU JP3RKJkwSuv7ViFsptkEAtvwIOlzegSmLGvqKSRfoKb69o+UIfpZirCbndr914CW12Ww JU9+uR0t63/f9krPyFsV9o+AdiqwHCMaD5Z6dZiCF73xuLwVXo6e2I69QIC9yZJBmhKC Vngg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Imzaqt52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n6-20020a170902dc8600b001c56ede4c97si1922019pld.239.2023.10.12.04.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 04:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Imzaqt52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C5B5F822CDC8; Thu, 12 Oct 2023 04:48:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378971AbjJLLsY (ORCPT + 99 others); Thu, 12 Oct 2023 07:48:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347199AbjJLLrB (ORCPT ); Thu, 12 Oct 2023 07:47:01 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB3F5C4; Thu, 12 Oct 2023 04:46:59 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7ae7:b86d:c19a:877e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id 5C49B6607368; Thu, 12 Oct 2023 12:46:58 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697111218; bh=+ac6y9CN7AEDcWAriiIST3GyWqbq9cgUUTvdotEB6/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Imzaqt52nbCypSbgVlMK7HiA7wfMRQz5QJ5l/b7I4hElPPTJ5r4DfxO/zMU55hCGp Gf688FMecpuRjSxxtB3D1pTSjQ0LAuyhUdF7U4gKNMoR/PYNq5p/M+2nU/LTcOBJyO fXs42nuD3dS3uTYKTkA02PWgRXCBOzci73PkRwhHHg6D9oQLXp7lI1nQgBB41NO9e4 buGTpx/3FcnbQ4qwHk3pakP73BEFc2UMjEEt4HB1l6k+uhzvR5j5GkVFSpspL2na/H cj6Ur4UInc7HjGLiefWCj/jfJfyS6m5DD3l68GyNCcqOswydV4+Joq4uoMkcndvNsT bOtRR17f7TYCA== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Hans de Goede , Sakari Ailus Subject: [PATCH v11 17/56] media: atomisp: Stop direct calls to queue num_buffers field Date: Thu, 12 Oct 2023 13:46:03 +0200 Message-Id: <20231012114642.19040-18-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231012114642.19040-1-benjamin.gaignard@collabora.com> References: <20231012114642.19040-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 12 Oct 2023 04:48:38 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. Signed-off-by: Benjamin Gaignard CC: Hans de Goede CC: Sakari Ailus --- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c index a8a964b2f1a8..09c0091b920f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -1028,7 +1028,7 @@ static int atomisp_qbuf_wrapper(struct file *file, void *fh, struct v4l2_buffer struct atomisp_device *isp = video_get_drvdata(vdev); struct atomisp_video_pipe *pipe = atomisp_to_video_pipe(vdev); - if (buf->index >= vdev->queue->num_buffers) + if (buf->index >= vb2_get_num_buffers(vdev->queue)) return -EINVAL; if (buf->reserved2 & ATOMISP_BUFFER_HAS_PER_FRAME_SETTING) { -- 2.39.2