From patchwork Thu Mar 16 14:38:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13177752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10A21C6FD19 for ; Thu, 16 Mar 2023 14:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=e+k93sB+yipkVcL+T+3kbGq52mSL6bZFpvMPfaDZk2Y=; b=vWBbGo69vpZesW iwXgnEg9I1LCm0L2X0bHizADUTj8dMjR/8vWxXZ+aPQ5jFUzJaEdoQ3uCSMujbW4G5MjEIwmfzRqX N2sCnqGuLQlMef/HB3XWB64Rps2hhGNPi8HMpGsQUK3H49G5plKtvFAHtFUar7rtcKZRE6cxvyy1a tx8JJV2bPfcBnjv0AYsPV6SmNogAGICtEKtEwGBO7WMENrpcLZ4U+2Aco0jz0CaCB1t/YFHD7S/p1 WnPJ4sS4OrXf5rRDqaFqSuUXFXmB+3TmBG2qOelNI2hqcZzjzBrNvkxGOLKuqzx+7bj+nxihrzAUY eMBNaX5DhDN8OINAWtUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcoki-00Gi4s-0X; Thu, 16 Mar 2023 14:38:48 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcoka-00Gi0e-34 for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2023 14:38:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1678977521; x=1710513521; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C9sNIEVpGd0LWVqABddnM3tNj1tR5BNHnL7rTZOVfhY=; b=mMzjt914m5tyhJKgXpO5sBFUVF3NB0oZx4JQbXUcd4l4XMwrbfAl7JeI Ij0Xr0b5GfYnF/IRP2GFw7a0SLPSSjgF79fDEfoDPuiebonO7fye2Zf5Z 5C9QFdremSUaObcKRIccd+YN/HqlIP59xa9zMWf324wChOIUiD5O5fCAT ASQD/BRA1kU+7Gj64zCZ6ygD9gXpDvv1txueL8CpTV4l+3KA36qupADez yRQTMk2RwphKm1MDkxULvbKg7BdJ172WxU5BXtoA82Orx4Ej5uokej4/N M8v5k52Rft8PODCSwLjtb50MGB8RGwpX/5RRuea0bY67Vq8FgKZAypyLD A==; X-IronPort-AV: E=Sophos;i="5.98,265,1673910000"; d="scan'208";a="29742389" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 16 Mar 2023 15:38:34 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Thu, 16 Mar 2023 15:38:35 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Thu, 16 Mar 2023 15:38:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1678977515; x=1710513515; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C9sNIEVpGd0LWVqABddnM3tNj1tR5BNHnL7rTZOVfhY=; b=GzjEgpHWDfnYv9oWF4xkwJTgyDvlf1EiT6g6QHwaY8w9eIdOXlcAxuXZ zTuAs2ba3qVoAMXFnE1FozAqZYTS8+Ja/625NpBIsFNSumqCsiYqVbvYH zicn+p+STz2kfwFPL5owR5dTf2n9k8Nu5vi5wRl2ueW7NEBQ5DCA05W6r KE2MWdEvzMl8K5ubw5YfrkbQAxg00KSfpJSPhUYGLB05tbigkXCi3Aqfi CgsNin24Lh80dOPwolaIawrmeqPxfjitdRQKVWu+GLY4w0PjrKQbTlE43 PacJoaKYoKatGvUNvLe53S52iG8jfQNjdjOa7Z1uW4xXZBHcNlCCHDhVR g==; X-IronPort-AV: E=Sophos;i="5.98,265,1673910000"; d="scan'208";a="29742387" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 16 Mar 2023 15:38:34 +0100 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 9C9C0280072; Thu, 16 Mar 2023 15:38:34 +0100 (CET) From: Alexander Stein To: Rui Miguel Silva , Laurent Pinchart , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: Alexander Stein , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] media: imx: imx7-media-csi: Fail for non video-capture formats Date: Thu, 16 Mar 2023 15:38:29 +0100 Message-Id: <20230316143829.499039-4-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316143829.499039-1-alexander.stein@ew.tq-group.com> References: <20230316143829.499039-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230316_073841_347503_9963B175 X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This driver only support V4L2_BUF_TYPE_VIDEO_CAPTURE, so fail for other passed types. Signed-off-by: Alexander Stein --- drivers/media/platform/nxp/imx7-media-csi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 389d7d88b341..e470b0505d3b 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1186,6 +1186,11 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, static int imx7_csi_video_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) { + struct imx7_csi *csi = video_drvdata(file); + + if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + __imx7_csi_video_try_fmt(&f->fmt.pix, NULL); return 0; } @@ -1196,6 +1201,9 @@ static int imx7_csi_video_s_fmt_vid_cap(struct file *file, void *fh, struct imx7_csi *csi = video_drvdata(file); const struct imx7_csi_pixfmt *cc; + if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + if (vb2_is_busy(&csi->q)) { dev_err(csi->dev, "%s queue busy\n", __func__); return -EBUSY;