Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4126828rdb; Thu, 14 Sep 2023 12:34:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGH0WnPOpHSNZSB9WPgcvwY+CFPfzgLGGu350Izka5tPA1w15PRLfA9qqbjeeihyqbUxE+U X-Received: by 2002:a05:6a20:1615:b0:134:73f6:5832 with SMTP id l21-20020a056a20161500b0013473f65832mr4233764pzj.16.1694720057531; Thu, 14 Sep 2023 12:34:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694720057; cv=none; d=google.com; s=arc-20160816; b=CuLBJR7tXml6TzFYHdPaFnlq9OR9Xqs/H7FSWlsUQITbJKQw4YNUqzdt//O3p9jkoD qMoZ1VqAwiA2fHWAAjA3d627m+YoLMJKyf5rnGIcV3TV0ID1wd0sayMT7t+v1q7wf8PQ L4j78RBSpXUfoTNqE3Zo5pMndzqn2jWWH4bWQA+STUnok1g0enndI6xq0E5Fr5mcg4OQ aX2Hxi3XZJX/Y/xlPcFsa/xhGLo1QsiE5uiOo2iNauqhftmfAdJyucfjI/B6pVvX83Im IRcnwqsJnqBWLkYiiea0qW4DsJKihGSPlSRjLJ5BL2aABFeozYTAkR7IE4F/CjIiD0yB i+zw== 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=5R/PgQ9e5CNPNqndSb4rIVp3OPzOtN9sFynvrYOHk1Q=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=MMJndvIY5XJBP4aaMrXm5epe2LMVNWEK4uDTsLSBwqd1OrKMA8z8N4fTUiISellAJA Jmyq2zC+M2J6UBARtnlqTHtJiugzA8WDv2ARAfgjnklBbeW1c8wiVE1Bz9+Kfn2sbvqr oh6b+QWxv+VRKScnT3EaSwe7eVJHA5T4OYxNZ1yT1ntXmRy97H9NnCYn/cYRkCxPOS+A NQIPya3Cn16MLRkGh0Y4mIGuBOImk9JoCc7z5RJyC66DZsl/F65FqOTzp0494ENGW13H Pw1Ut+QF39k8cgTp2txoW1GplAAXDqlGv980/ozoZuo2vDjz04AW//On595JZEddlB01 J76A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="BF/oWSSz"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id r26-20020a638f5a000000b0055bc23bdde5si2043085pgn.176.2023.09.14.12.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 12:34:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="BF/oWSSz"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 828A582A3997; Thu, 14 Sep 2023 06:35:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239851AbjINNfk (ORCPT + 99 others); Thu, 14 Sep 2023 09:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239311AbjINNe5 (ORCPT ); Thu, 14 Sep 2023 09:34:57 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A508273F; Thu, 14 Sep 2023 06:33:54 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:36f2:37bd:ccbb:373f]) (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 8C248660735A; Thu, 14 Sep 2023 14:33:52 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694698433; bh=g+cKvL+57Ge4BbEO/J6pfXbFnIiiN4vCjyxapf5D6Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BF/oWSSzruSq2mPoOs3pLdafwHgIDEVGPUJAogmZ2Pn3jq91kpmFLkc/leTdV6CLe o0YQeVWi8i3MmUFknNMB/4F09BncPnnh+uzR2+i7peezooDR61j9s1VYvwzoQmsAoU 4HxpCDwVjGIhhTt2lygHGUfa8XRvnbGokkOk8XddVXNmqYNJp7UOrLHCIbejmme0Dz 15oxHz7rGTwk65MLth9ocO39WL1t2xF1Cxpj3vnZO6kCAd0aCYIysAtSyfbEaGG0ii 2WkUXpAmARnf3OGLeiiQSXI5rlMTkSqDxy4WXS0kmH1PwX6wTgTAEB+QQZqEH1wEOe txQgTb8VXbQ6w== 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 v7 41/49] media: atomisp: Stop direct calls to queue num_buffers field Date: Thu, 14 Sep 2023 15:33:15 +0200 Message-Id: <20230914133323.198857-42-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914133323.198857-1-benjamin.gaignard@collabora.com> References: <20230914133323.198857-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:35:42 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffer 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 4b65c69fa60d..48f9745421a9 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -1030,7 +1030,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