From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 11 May 2022 12:11:11 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nojJH-009WVg-0Z for lore@lore.pengutronix.de; Wed, 11 May 2022 12:11:11 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nojJF-0000uD-5p for lore@pengutronix.de; Wed, 11 May 2022 12:11:09 +0200 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=N/voy2Cd0tdFiHCRW1+np0cLTR42q/7sRPqGue1d4h4=; b=wXXALOdN03tczz VKzbcH4rIDl7LpseuouZYVmleY1MDgrfySui5UpA+71Jvly9Do0+j6XdG7mNojgUr1NREDh+dM6P6 ssPf6UPS98V7YrQR+NcMoWvr1PZaIKyLJZ0JjtlbyQqaKqDH27phVhafXxbgCsWUlIQSl9ZolUmbe OlW6A7lZ/BS/OUUuv5d/eFxWD3RlqdD1ab0v462jZ6d2Rc+4N3umQfZR7s+OfkDGK08A3kJ8UWY2p I7uaav/42QRsYzKdpoaP7HSMHYvzKx0M+9haoapf5+Ck8jhjxNcARrl++t8L2GB0MVlje9M8yBxvc Ou9kYNiyoEllRcRoTAHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nojHb-006HpU-NW; Wed, 11 May 2022 10:09:27 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nojHW-006Hnx-8I for barebox@lists.infradead.org; Wed, 11 May 2022 10:09:23 +0000 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nojHQ-0000Y2-QS; Wed, 11 May 2022 12:09:16 +0200 From: Bastian Krause To: barebox@lists.infradead.org Date: Wed, 11 May 2022 12:09:11 +0200 Message-Id: <20220511100911.2009482-1-bst@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220511_030922_325971_C9FEC84E X-CRM114-Status: GOOD ( 11.80 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum , Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.5 required=4.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] clk: handle NULL args in clk_set_parent() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) NULL struct clk pointers should be treated just as the Linux kernel clk driver does [1]. The reasoning should also apply to the parent clk argument. A NULL struct clk pointer can happen for example on the Freescale i.MX6 SABRE Smart Device Board if CONFIG_DRIVER_VIDEO_IMX_IPUV3 is disabled, leading to assigned-clocks IMX6QDL_CLK_LDB_DI0_SEL and IMX6QDL_CLK_LDB_DI1_SEL [2] being unavailable. Without this patch, the board hangs while setting those assigned clock configurations since [3]. [1] 89ac8d7ae1cd ("clk: handle NULL struct clk gracefully") [2] dts/src/arm/imx6qdl-sabresd.dtsi [3] f5eb5fddb4 ("clk: fix of clk set defaults when dev is a clk provider") Signed-off-by: Bastian Krause --- drivers/clk/clk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 8e317b4b05..efb5d4ad4a 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -230,7 +230,10 @@ int clk_set_parent(struct clk *clk, struct clk *newparent) { struct clk_hw *hw; int i, ret; - struct clk *curparent = clk_get_parent(clk); + struct clk *curparent; + + if (!clk || !newparent) + return 0; if (IS_ERR(clk)) return PTR_ERR(clk); @@ -254,6 +257,8 @@ int clk_set_parent(struct clk *clk, struct clk *newparent) if (i == clk->num_parents) return -EINVAL; + curparent = clk_get_parent(clk); + if (clk->enable_count) clk_enable(newparent); -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox