Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2253243iof; Wed, 8 Jun 2022 00:34:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL+6idWA7xSvcMjQifu+R38xAg2x0VZ88lyxij9g18Rox8aRtaAlmqBXVabA6Tq9qpSApd X-Received: by 2002:a17:90b:3802:b0:1e3:3f3a:3621 with SMTP id mq2-20020a17090b380200b001e33f3a3621mr45764917pjb.65.1654673651356; Wed, 08 Jun 2022 00:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654673651; cv=none; d=google.com; s=arc-20160816; b=IGm4Umt3IOVWCJnhh6cfqm7rSKStuglHVt5cghaTG/FOznO7HbAADvXDifa4W4JqdG 4SsaC3aEQW5TGBLlZDiP8VHVeEB8+nqfIBzIAr2PLgxFJ9VmCkg7fek548VSTclbyjli or0ikmn3P5tUdhD0JrYaIYumCmGv8e4B1qqKZr4/Q8w7ijiUMt/vSzhDnrMEjehpgmdh QBXOXDSek2qyf1oFKsi/v+HvZSlLISyGi+6ZF/Des9khuqQG2nqeUcQcMQmlwjovL0UM LcinxvhRr4qbfBmiye1dcyLhouhMQi8Ta8xcN0DpfiX7TEfyMQn35I/5aoyvry8qUcoz lQVw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8lBy1ptGFVFuhKb+KnZSEvOjGERBZKdrM3PbXH5Mt/c=; b=H1ubQajMUW1JK7nAT9O818ujL7MLa+n1SGxpXvLlVtSO9TnlpWLUgBvM09ePQSrvgW +DElk+r/idlxUK+jHt9+OJGPnBS2qSKdNvCIeb2J2rPxRuT9t5AcfMFS8mPw3HNCivHC uneLsDHvs1wl3oeevC+UsaciMTYAzhNwQUn6liyGdWd2Rg75GZiMSoOiYFWrS9pVt/wM ozAnNKLMxV5MxYZGnEIg42qvt+2cfjPnxesBCg0HOJ3cPE7aWPd/M21xLAkiUny/bKzo lwpwzlZUGe3/CkUvoAVH0Yx0hq6T+Fi1kwfBQ3D89gy5TwFq8UUAIrlYSKS+XDZy4teU 6aGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IUcRw+En; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id l7-20020a17090aaa8700b001dfd2940a5asi29596053pjq.112.2022.06.08.00.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 00:34:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IUcRw+En; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 71C1B226543; Wed, 8 Jun 2022 00:06:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380316AbiFGWiF (ORCPT + 99 others); Tue, 7 Jun 2022 18:38:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378812AbiFGVZJ (ORCPT ); Tue, 7 Jun 2022 17:25:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59D32150A2B; Tue, 7 Jun 2022 12:01:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B785D61787; Tue, 7 Jun 2022 19:01:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1FFCC385A2; Tue, 7 Jun 2022 19:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628476; bh=YYntbBxSmHLpv4WdmEm/Uq7d1DT6K8VOfuhEt88cfHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IUcRw+EngNipYMwYKoKAx4D8PFsvyQncR8ml2xx0PZ2vPG82E0j0xcLQsWUW1IIS6 x4PElYis39kYqbf7BIf8DJC/SO0EPZxGmynIKM+U45eUfC6FnR3ljkJllAuYpMIQEk rnJDbvB3O1rl9ygDJtAVhJzZAs56/kg4FZ8hwzxY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurent Pinchart , Rui Miguel Silva , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.18 344/879] media: imx: imx-mipi-csis: Fix active format initialization on source pad Date: Tue, 7 Jun 2022 18:57:42 +0200 Message-Id: <20220607165012.845606488@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurent Pinchart [ Upstream commit fe14b546d6e57542dbd4f5ccdb5a382904d26c5a ] Commit 5c0701a0e791 ("media: imx: csis: Store pads format separately") broke initialization of the active format on the source pad, as it forgot to update the .init_cfg() handler. Fix it. Fixes: 5c0701a0e791 ("media: imx: csis: Store pads format separately") Signed-off-by: Laurent Pinchart Acked-by: Rui Miguel Silva Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/nxp/imx-mipi-csis.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index d9719d0b2f0a..e0e345fbb00f 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -994,14 +994,6 @@ static int mipi_csis_init_cfg(struct v4l2_subdev *sd, V4L2_MAP_QUANTIZATION_DEFAULT(false, fmt_sink->colorspace, fmt_sink->ycbcr_enc); - /* - * When called from mipi_csis_subdev_init() to initialize the active - * configuration, cfg is NULL, which indicates there's no source pad - * configuration to set. - */ - if (!sd_state) - return 0; - fmt_source = mipi_csis_get_format(csis, sd_state, which, CSIS_PAD_SOURCE); *fmt_source = *fmt_sink; -- 2.35.1