| From a4cce9a251627ea8bb82c684273f073dfadc5204 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Dec 2021 12:26:27 +0000 |
| Subject: fsl/fman: Fix missing put_device() call in fman_port_probe |
| |
| From: Miaoqian Lin <linmq006@gmail.com> |
| |
| [ Upstream commit bf2b09fedc17248b315f80fb249087b7d28a69a6 ] |
| |
| The reference taken by 'of_find_device_by_node()' must be released when |
| not needed anymore. |
| Add the corresponding 'put_device()' in the and error handling paths. |
| |
| Fixes: 18a6c85fcc78 ("fsl/fman: Add FMan Port Support") |
| Signed-off-by: Miaoqian Lin <linmq006@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/freescale/fman/fman_port.c | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c |
| index 47f6fee1f3964..1812434cda847 100644 |
| --- a/drivers/net/ethernet/freescale/fman/fman_port.c |
| +++ b/drivers/net/ethernet/freescale/fman/fman_port.c |
| @@ -1791,7 +1791,7 @@ static int fman_port_probe(struct platform_device *of_dev) |
| 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); |
| @@ -1799,7 +1799,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; |
| @@ -1833,7 +1833,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; |
| @@ -1847,7 +1847,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; |
| } |
| @@ -1857,7 +1857,7 @@ 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; |
| @@ -1882,6 +1882,8 @@ static int fman_port_probe(struct platform_device *of_dev) |
| |
| return 0; |
| |
| +put_device: |
| + put_device(&fm_pdev->dev); |
| return_err: |
| of_node_put(port_node); |
| free_port: |
| -- |
| 2.34.1 |
| |