From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D16DC433FF for ; Thu, 15 Aug 2019 04:10:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50CF12133F for ; Thu, 15 Aug 2019 04:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565842239; bh=8F3KRsBxdhyWon/KQ5t5lXGBquSIxOV11AsIVZq7ikQ=; h=From:To:Cc:Subject:Date:List-ID:From; b=s/HWWMX96mseOg6TymoK7/jFJs4agNA0k0NP8qc1bYCQPZab8sOwvUpZSCeyhP15L brpz7CAp5MnLnK3iwf8ZmJ9gIJupRPzbU2HCb+VdxCOc37Ki9AdWWNgird5znvy8bu eYzS00MwImYph9imzHTdtC9nUbNwIOu8IQ4nsiWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725875AbfHOEKj (ORCPT ); Thu, 15 Aug 2019 00:10:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:33152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725832AbfHOEKi (ORCPT ); Thu, 15 Aug 2019 00:10:38 -0400 Received: from mail.kernel.org (unknown [104.132.0.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 37CF9208C2; Thu, 15 Aug 2019 04:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565842238; bh=8F3KRsBxdhyWon/KQ5t5lXGBquSIxOV11AsIVZq7ikQ=; h=From:To:Cc:Subject:Date:From; b=QHwVyyn3C/XQA4Csutk/Nfs1u2TaBaXhbnpmmiQs9nwObS17SgmrWrpd5PCpCRTJo U7MMeOVGYnOx/aanAWmj0gRPLfFw+/kW0LnoUDXenr3muZyvliLInjrX1NaYUi3ASY dfEXFC1qN/ue9gWK+TSQHvSsJmG7PmiTR7/lAqXI= From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai Subject: [PATCH] clk: sunxi: Don't call clk_hw_get_name() on a hw that isn't registered Date: Wed, 14 Aug 2019 21:10:37 -0700 Message-Id: <20190815041037.3470-1-sboyd@kernel.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org The implementation of clk_hw_get_name() relies on the clk_core associated with the clk_hw pointer existing. If of_clk_hw_register() fails, there isn't a clk_core created yet, so calling clk_hw_get_name() here fails. Extract the name first so we can print it later. Fixes: 1d80c14248d6 ("clk: sunxi-ng: Add common infrastructure") Cc: Maxime Ripard Cc: Chen-Yu Tsai Signed-off-by: Stephen Boyd --- drivers/clk/sunxi-ng/ccu_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c index 7fe3ac980e5f..2e20e650b6c0 100644 --- a/drivers/clk/sunxi-ng/ccu_common.c +++ b/drivers/clk/sunxi-ng/ccu_common.c @@ -97,14 +97,15 @@ int sunxi_ccu_probe(struct device_node *node, void __iomem *reg, for (i = 0; i < desc->hw_clks->num ; i++) { struct clk_hw *hw = desc->hw_clks->hws[i]; + const char *name; if (!hw) continue; + name = hw->init->name; ret = of_clk_hw_register(node, hw); if (ret) { - pr_err("Couldn't register clock %d - %s\n", - i, clk_hw_get_name(hw)); + pr_err("Couldn't register clock %d - %s\n", i, name); goto err_clk_unreg; } } base-commit: 5f9e832c137075045d15cd6899ab0505cfb2ca4b -- Sent by a computer through tubes