From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A03F17727; Mon, 27 May 2024 19:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716838555; cv=none; b=bHrh9BRR+BiLeRm+NhjYfQJ+Wg9zDs4KpRbzIj95HtshJ9kJws1c023fDZFtXLe+lojPx0fm2PibEVfbSnCLIdB5qykO7XGprOTszIfFOCilzSB1sz0R0xLMNeJdihZcRh4MDml10zRWxO5mqZ+9lze0LApZXljjYSsnUMiWmC0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716838555; c=relaxed/simple; bh=Rml015BulBf0mcVK/dwqY9Lh1PfeI8aQ8YMw/9skfFs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mMFA8DWj0ski3iYYYj/FS8x4oJcJrvx59yvIpX0JpwlOk/m8+SVM889cxoCj5XPhxM9s8yiRXxr6Fd8js03aaqQSvTntRNsdZUjsrmmMZVeEj/NpA2IkdDS4sv50DYW5Chg/WRF+S8nO0bcfFQCRPLdfFw6X6brtwaPqDuFboho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wce3Xpgr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wce3Xpgr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8090C2BBFC; Mon, 27 May 2024 19:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716838555; bh=Rml015BulBf0mcVK/dwqY9Lh1PfeI8aQ8YMw/9skfFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wce3XpgrdIIVRSwAcV/dfc3K0WnuXpMrjGDaNHCGiEmbLXkIHq+05YrWZtntHeVOQ b0uQFgzIDmiggrYZQ087XAqwT9Zld0ygNDukCxkgT4US9JpuRqTuinHoB7IvA++V22 qA9dRF5kgEnnv77fsOD1xbtdnrC9JNl7pW1hr4eA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Pinchart , Tomi Valkeinen , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 6.8 398/493] media: v4l2-subdev: Fix stream handling for crop API Date: Mon, 27 May 2024 20:56:40 +0200 Message-ID: <20240527185643.293509545@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240527185626.546110716@linuxfoundation.org> References: <20240527185626.546110716@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laurent Pinchart [ Upstream commit 34d7bf1c8e59f5fbf438ee32c96389ebe41ca2e8 ] When support for streams was added to the V4L2 subdev API, the v4l2_subdev_crop structure was extended with a stream field, but the field was not handled in the core code that translates the VIDIOC_SUBDEV_[GS]_CROP ioctls to the selection API. Fix it. Fixes: 2f91e10ee6fd ("media: subdev: add stream based configuration") Signed-off-by: Laurent Pinchart Reviewed-by: Tomi Valkeinen Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-subdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 4c6198c48dd61..45836f0a2b0a7 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -732,6 +732,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg, memset(&sel, 0, sizeof(sel)); sel.which = crop->which; sel.pad = crop->pad; + sel.stream = crop->stream; sel.target = V4L2_SEL_TGT_CROP; rval = v4l2_subdev_call( @@ -756,6 +757,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg, memset(&sel, 0, sizeof(sel)); sel.which = crop->which; sel.pad = crop->pad; + sel.stream = crop->stream; sel.target = V4L2_SEL_TGT_CROP; sel.r = crop->rect; -- 2.43.0