lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 473/862] clk: sprd: Hold reference returned by of_get_parent()
    Date
    From: Liang He <windhl@126.com>

    [ Upstream commit 91e6455bf715fb1558a0bf8f645ec1c131254a3c ]

    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 <windhl@126.com>
    Link: https://lore.kernel.org/r/20220704004729.272481-1-windhl@126.com
    Reviewed-by: Orson Zhai <orsonzhai@gmail.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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..ce81e4087a8f 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.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:22    [W:3.828 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site