[PATCH V3] fsl/fman: add missing put_devcie() call in fman_port_probe()

[Yu Kuai]

if of_find_device_by_node() succeed, fman_port_probe() doesn't have a
corresponding put_device(). Thus add jump target to fix the exception
handling for this function implementation.

Fixes: 0572054617f3 ("fsl/fman: fix dereference null return value")
Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
Changes in V3:
 - move of_node_put(port_node) backward, so that error handling can be the
 reverse of the order of execution.
 - rename retur_err to put_node

 .../net/ethernet/freescale/fman/fman_port.c   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c 
b/drivers/net/ethernet/freescale/fman/fman_port.c
index d9baac0dbc7d..9790e483241b 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -1792,20 +1792,20 @@ 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 return_err;
+               goto free_port;
        }
 
        fm_pdev = of_find_device_by_node(fm_node);
        of_node_put(fm_node);
        if (!fm_pdev) {
                err = -EINVAL;
-               goto return_err;
+               goto put_node;
        }
 
        fman = dev_get_drvdata(&fm_pdev->dev);
        if (!fman) {
                err = -EINVAL;
-               goto return_err;
+               goto put_device;
        }
 
        err = of_property_read_u32(port_node, "cell-index", &val);
@@ -1813,7 +1813,7 @@ static int fman_port_probe(struct platform_device *of_dev)
                dev_err(port->dev, "%s: reading cell-index for %pOF failed\n",
                        __func__, port_node);
                err = -EINVAL;
-               goto return_err;
+               goto put_device;
        }
        port_id = (u8)val;
        port->dts_params.id = port_id;
@@ -1847,7 +1847,7 @@ static int fman_port_probe(struct platform_device *of_dev)
        }  else {
                dev_err(port->dev, "%s: Illegal port type\n", __func__);
                err = -EINVAL;
-               goto return_err;
+               goto put_device;
        }
 
        port->dts_params.type = port_type;
@@ -1861,7 +1861,7 @@ static int fman_port_probe(struct platform_device *of_dev)
                        dev_err(port->dev, "%s: incorrect qman-channel-id\n",
                                __func__);
                        err = -EINVAL;
-                       goto return_err;
+                       goto put_device;
                }
                port->dts_params.qman_channel_id = qman_channel_id;
        }
@@ -1871,22 +1871,21 @@ static int fman_port_probe(struct platform_device 
*of_dev)
                dev_err(port->dev, "%s: of_address_to_resource() failed\n",
                        __func__);
                err = -ENOMEM;
-               goto return_err;
+               goto put_device;
        }
 
        port->dts_params.fman = fman;
 
-       of_node_put(port_node);
-
        dev_res = __devm_request_region(port->dev, &res, res.start,
                                        resource_size(&res), "fman-port");
        if (!dev_res) {
                dev_err(port->dev, "%s: __devm_request_region() failed\n",
                        __func__);
                err = -EINVAL;
-               goto free_port;
+               goto put_device;
        }
 
+       of_node_put(port_node);
        port->dts_params.base_addr = devm_ioremap(port->dev, res.start,
                                                  resource_size(&res));
        if (!port->dts_params.base_addr)
@@ -1896,7 +1895,9 @@ static int fman_port_probe(struct platform_device *of_dev)
 
        return 0;
 
-return_err:
+put_device:
+       put_device(&fm_pdev->dev);
+put_node:
        of_node_put(port_node);
 free_port:
        kfree(port);
-- 
2.25.4