Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp1807218rdb; Tue, 3 Oct 2023 01:11:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETQKN76aCxZXcszRfeWzuyV6tkhx11LWY5wIo5ZXrpCjxiCEOCb5sFNDD7bB1veOELKTl1 X-Received: by 2002:a05:6358:785:b0:142:eb11:b0b8 with SMTP id n5-20020a056358078500b00142eb11b0b8mr17891447rwj.1.1696320714067; Tue, 03 Oct 2023 01:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696320714; cv=none; d=google.com; s=arc-20160816; b=FuL4gHQnSlfccvf2jHmBBATY92GosMmFtSOPtk5Uw9Yj0Gboat+nZq149fw0iGiHxN VDaY4D8HySipke4OOZQM9n16Az3EBLUdBOqIYP8GTjFlR7DHpqNAI7E59AoLvGmzbymZ uhsZFmBxMK/jXAw+kf/WUHyyzD3zN4BE6LeamrbkE0aAd0WckB+oFHdHT+3bDDpoTKEL Dw8qQgV6Edj2/5DDTNR0uaTghsQRVck9HFQlQTjYR2il3nCQKnKBjm/B51nbh92PTbJa N0SIZqF0v67qxyOt48BgdbXJI9GIEAJPMkGndQvX76a3xD+clgN4iu8ZQiQMCkDWTdaG FOjQ== 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=bNduaqrku0Jg47XZY3aDAjxbyic9avl6NAHhoHeTqtU=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=Dx+NElFRn7G2Y8UyVkaT7IzJQzrbIHhfMbYzhKI4zCID5lU0ltt9lAVJDAcecF01Iz zF93iidCtbXLaQFtsk4XfQ89TSCEzAVVwGgBiy4WFk9KjQVyIVIE52EfTYX50Psbf5/m kh+DajllJXtDEUxDuqb0pYgAL8/DbldLbPGO552qPkqxPFDnVHAQq6gaINuAzNZlSjA2 FFH3g0UOovHDV87GctyANxeaALYTXznmHabgQQsMAHVvyY7V8U7Rz5F+dABCjrXXAVL2 ut3usLNvRY8emKJlchhaluutvX15GFu6Uw2hOBlUAC0VEeJ6sGEmpSc+nTaKDZjdGjsL BweQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=IuRAw8jE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id q26-20020a631f5a000000b0057745d87b53si865728pgm.686.2023.10.03.01.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 01:11:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=IuRAw8jE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 58E3D812281B; Tue, 3 Oct 2023 01:11:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239803AbjJCIK1 (ORCPT + 99 others); Tue, 3 Oct 2023 04:10:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239549AbjJCIHr (ORCPT ); Tue, 3 Oct 2023 04:07:47 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEFA2EE; Tue, 3 Oct 2023 01:07:36 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:b6df:b784:6a0f:8451]) (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 C2122660737F; Tue, 3 Oct 2023 09:07:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696320455; bh=7wWHAQBKZERZL+C0cKr4cK8pX2+DM141L+tvnughidA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IuRAw8jEBFwvC2xOA/+4P3LEk57X/hk2wWBg5ouQdwIO4kYGW8RycUbB/FHSLpd8k EEprlsd3AcrU5Tc7K1iwvBPLNY9Fq5zfZw34tKHJ7mw18ifFBi8vxtf4XJVF1cAe+J YYQyONScYasy99wzVUpCZCfNNFh0RK2IH2T/s6fecMp0Ikm8cIg7pZTjsJ2aO9JptW BSZHx2y50l1EGbWT873dFgi+8hVdinYG2fV5CpIJD+11q7q7rSu+Im9CLGwsK3onnQ oSoQfRbHuA7aGOzhb6r885lDPCTLzPxRbX2I5maECc91KwYM97QnhwYFjNLQnvGmf1 KtBYwBT2ITOcg== 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 Subject: [PATCH v10 42/54] media: atomisp: Stop direct calls to queue num_buffers field Date: Tue, 3 Oct 2023 10:06:51 +0200 Message-Id: <20231003080704.43911-43-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003080704.43911-1-benjamin.gaignard@collabora.com> References: <20231003080704.43911-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Tue, 03 Oct 2023 01:11:30 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. Signed-off-by: Benjamin Gaignard --- 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