[PATCH V2] memory: tegra: add missing put_devcie() call in error path of tegra_emc_probe()

[Yu Kuai]

The reference to device obtained with of_find_device_by_node() should
be dropped. Thus add jump target to fix the exception handling for this
function implementation.

Fixes: 73a7f0a90641("memory: tegra: Add EMC (external memory controller) 
driver")
Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
 drivers/memory/tegra/tegra124-emc.c           | 21 +++++++++++++------
 .../net/ethernet/freescale/fman/fman_port.c   |  3 +--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/memory/tegra/tegra124-emc.c 
b/drivers/memory/tegra/tegra124-emc.c
index 76ace42a688a..7d58a0e0a177 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -1207,8 +1207,10 @@ static int tegra_emc_probe(struct platform_device *pdev)
                return -ENOENT;
 
        emc->mc = platform_get_drvdata(mc);
-       if (!emc->mc)
-               return -EPROBE_DEFER;
+       if (!emc->mc) {
+               err = -EPROBE_DEFER;
+               goto put_device;
+       }
 
        ram_code = tegra_read_ram_code();
 
@@ -1217,25 +1219,27 @@ static int tegra_emc_probe(struct platform_device *pdev)
                dev_err(&pdev->dev,
                        "no memory timings for RAM code %u found in DT\n",
                        ram_code);
-               return -ENOENT;
+               err = -ENOENT;
+               goto put_device;
        }
 
        err = tegra_emc_load_timings_from_dt(emc, np);
        of_node_put(np);
        if (err)
-               return err;
+               goto put_device;
 
        if (emc->num_timings == 0) {
                dev_err(&pdev->dev,
                        "no memory timings for RAM code %u registered\n",
                        ram_code);
-               return -ENOENT;
+               err = -ENOENT;
+               goto put_device;
        }
 
        err = emc_init(emc);
        if (err) {
                dev_err(&pdev->dev, "EMC initialization failed: %d\n", err);
-               return err;
+               goto put_device;
        }
 
        platform_set_drvdata(pdev, emc);
@@ -1244,6 +1248,11 @@ static int tegra_emc_probe(struct platform_device *pdev)
                emc_debugfs_init(&pdev->dev, emc);
 
        return 0;
+
+put_device:
+       put_device(&mc->dev);
+
+       return err;
 };
 
 static struct platform_driver tegra_emc_driver = {
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c 
b/drivers/net/ethernet/freescale/fman/fman_port.c
index 9790e483241b..fcc59444df17 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -1792,7 +1792,7 @@ static int fman_port_probe(struct platform_device *of_dev)
        if (!fm_node) {
                dev_err(port->dev, "%s: of_get_parent() failed\n", __func__);
                err = -ENODEV;
-               goto free_port;
+               goto put_node;
        }
 
        fm_pdev = of_find_device_by_node(fm_node);
@@ -1899,7 +1899,6 @@ static int fman_port_probe(struct platform_device *of_dev)
        put_device(&fm_pdev->dev);
 put_node:
        of_node_put(port_node);
-free_port:
        kfree(port);
        return err;
 }
-- 
2.25.4