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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EE66C433EF for ; Mon, 4 Jul 2022 00:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbiGDArp (ORCPT ); Sun, 3 Jul 2022 20:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbiGDAro (ORCPT ); Sun, 3 Jul 2022 20:47:44 -0400 Received: from mail-m965.mail.126.com (mail-m965.mail.126.com [123.126.96.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 765EA5FFA for ; Sun, 3 Jul 2022 17:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=D5i7B 8+dtlyt4oFQpHdL8CK7nBS+q2gZNZQKEqC3sOY=; b=eWOZyi+/DqRbHhDGTzLJf h6KCShST8bTneUwakjFtsCjyL6nsGfsxRcYP2dpL+WU50ypbNf6BLgCv/D1bBdqw TnFbAHpERfMYWLs/lOq1makahwiKvyvi6I+dbwK1xGw5xnWAuMswz7QldyRNR+QK YXryiAwHyDm+qv7WOTJV1w= Received: from localhost.localdomain (unknown [124.16.139.61]) by smtp10 (Coremail) with SMTP id NuRpCgCXnMSiOMJiUGz1Fw--.8817S2; Mon, 04 Jul 2022 08:47:31 +0800 (CST) From: Liang He To: mturquette@baylibre.com, sboyd@kernel.org, orsonzhai@gmail.com, baolin.wang7@gmail.com, zhang.lyra@gmail.com, linux-clk@vger.kernel.org, windhl@126.com Subject: [PATCH v5] clk: sprd: Hold reference returned by of_get_parent() Date: Mon, 4 Jul 2022 08:47:29 +0800 Message-Id: <20220704004729.272481-1-windhl@126.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: NuRpCgCXnMSiOMJiUGz1Fw--.8817S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AryDWF4xKw1xXFyfuFWUtwb_yoW8Cr18pa 4UWFWYvFsrWrWUWFn2vF95ZFyFqw1SqayFv34xG3Za93ZxtFyrGw1YgFy8ur90yFZ5Ca45 JryqkFW8Ja1UXF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziY9aPUUUUU= X-Originating-IP: [124.16.139.61] X-CM-SenderInfo: hzlqvxbo6rjloofrz/1tbi3AM0F1pED2jh+gAAse Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance. Fixes: f95e8c7923d1 ("clk: sprd: support to get regmap from parent node") Signed-off-by: Liang He --- changelog: v5: fix bug reported by Chunyan and confirmed by Orson v4: fix another bug in the same place, missing in v3 v3: (1) keep original 'if-else if-else' coding style adviesd by Orson (2) fix typo in commit-log: of_node_out --> of_node_put v2: minimize the effective range of of_get_parent() advised by Orson v1: hold reference returned by of_get_parent() drivers/clk/sprd/common.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c index d620bbbcdfc8..24db1df09075 100644 --- a/drivers/clk/sprd/common.c +++ b/drivers/clk/sprd/common.c @@ -41,7 +41,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev, { void __iomem *base; struct device *dev = &pdev->dev; - struct device_node *node = dev->of_node; + struct device_node *node = dev->of_node, *np; struct regmap *regmap; if (of_find_property(node, "sprd,syscon", NULL)) { @@ -50,9 +50,10 @@ int sprd_clk_regmap_init(struct platform_device *pdev, pr_err("%s: failed to get syscon regmap\n", __func__); return PTR_ERR(regmap); } - } else if (of_device_is_compatible(of_get_parent(dev->of_node), - "syscon")) { - regmap = device_node_to_regmap(of_get_parent(dev->of_node)); + } else if (of_device_is_compatible(np = of_get_parent(node), "syscon") + || (of_node_put(np), 0)) { + regmap = device_node_to_regmap(np); + of_node_put(np); if (IS_ERR(regmap)) { dev_err(dev, "failed to get regmap from its parent.\n"); return PTR_ERR(regmap); -- 2.25.1