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 4C75C6FB1; Tue, 5 Dec 2023 03:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ENIlVLh2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1C77C433C8; Tue, 5 Dec 2023 03:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1701747395; bh=apGH0I7MaO7YgpMIzVhpflHcdfWXmxjqqu4l1bQsAiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENIlVLh23rb3OuFNNLbbnIFTnwpZ+ptVMb8hMKLlaZxSaFgea5zndE6/YD4zE9ZWz V24PdNiJhoiy3dD0ClQoeYW32cjoi4/wFdz2vMdbgeacgXbAr4IpnypV21mW3y7NRS Ncx9KNCciXAyPq/p/NpKdTDGbF1aJN1cd0ZtmZWk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sakari Ailus , Laurent Pinchart , Hans Verkuil , Sasha Levin Subject: [PATCH 5.10 036/135] media: ccs: Correctly initialise try compose rectangle Date: Tue, 5 Dec 2023 12:15:57 +0900 Message-ID: <20231205031532.932933930@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205031530.557782248@linuxfoundation.org> References: <20231205031530.557782248@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sakari Ailus [ Upstream commit 724ff68e968b19d786870d333f9952bdd6b119cb ] Initialise the try sink compose rectangle size to the sink compose rectangle for binner and scaler sub-devices. This was missed due to the faulty condition that lead to the compose rectangles to be initialised for the pixel array sub-device where it is not relevant. Fixes: ccfc97bdb5ae ("[media] smiapp: Add driver") Cc: stable@vger.kernel.org Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/i2c/smiapp/smiapp-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -2647,7 +2647,7 @@ static int smiapp_open(struct v4l2_subde try_fmt->code = sensor->internal_csi_format->code; try_fmt->field = V4L2_FIELD_NONE; - if (ssd != sensor->pixel_array) + if (ssd == sensor->pixel_array) continue; try_comp = v4l2_subdev_get_try_compose(sd, fh->pad, i);