diff options
| author |  Antoine Tenart <antoine.tenart@free-electrons.com>
| 2017-11-28 14:19:49 +0100 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2017-11-28 10:09:50 -0500 |
| commit | 26146b0e6b6869c6cd8a45ab3a4a5562e7a91b23 (patch) | |
| tree | 81cb229bec7b0b18e66af3633f5ae4a6b35c1159 /drivers/net/ethernet | |
| parent | net: mvpp2: fix the txq_init error path (diff) | |
| download | linux-26146b0e6b6869c6cd8a45ab3a4a5562e7a91b23.tar.gz linux-26146b0e6b6869c6cd8a45ab3a4a5562e7a91b23.tar.bz2 linux-26146b0e6b6869c6cd8a45ab3a4a5562e7a91b23.zip | |
net: mvpp2: cleanup probed ports in the probe error path
This patches fixes the probe error path by cleaning up probed ports, to
avoid leaving registered net devices when the driver failed to probe.
Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 79f01cd80dd7..afae4fe00965 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -8329,7 +8329,7 @@ static int mvpp2_probe(struct platform_device *pdev) for_each_available_child_of_node(dn, port_node) { err = mvpp2_port_probe(pdev, port_node, priv, i); if (err < 0) - goto err_mg_clk; + goto err_port_probe; i++; } @@ -8345,12 +8345,19 @@ static int mvpp2_probe(struct platform_device *pdev) priv->stats_queue = create_singlethread_workqueue(priv->queue_name); if (!priv->stats_queue) { err = -ENOMEM; - goto err_mg_clk; + goto err_port_probe; } platform_set_drvdata(pdev, priv); return 0; +err_port_probe: + i = 0; + for_each_available_child_of_node(dn, port_node) { + if (priv->port_list[i]) + mvpp2_port_remove(priv->port_list[i]); + i++; + } err_mg_clk: clk_disable_unprepare(priv->axi_clk); if (priv->hw_version == MVPP22) |