OSDN Git Service

memory: tegra: Add a missing 'of_node_put()' call
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Wed, 4 Jan 2017 07:13:24 +0000 (08:13 +0100)
committerThierry Reding <treding@nvidia.com>
Wed, 25 Jan 2017 06:57:13 +0000 (07:57 +0100)
If 'of_find_device_by_node()' fails, an 'of_node_put()' call is missing in
the error handling path.
Fix it by reordering the code.

While at it, remove some empty lines in a more or less similar construction
a few lines below.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/memory/tegra/tegra124-emc.c

index 06cc781..392dc8d 100644 (file)
@@ -1115,11 +1115,10 @@ static int tegra_emc_probe(struct platform_device *pdev)
        }
 
        mc = of_find_device_by_node(np);
+       of_node_put(np);
        if (!mc)
                return -ENOENT;
 
-       of_node_put(np);
-
        emc->mc = platform_get_drvdata(mc);
        if (!emc->mc)
                return -EPROBE_DEFER;
@@ -1135,9 +1134,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
        }
 
        err = tegra_emc_load_timings_from_dt(emc, np);
-
        of_node_put(np);
-
        if (err)
                return err;