If an error occurs when allocating the net_device, all the one already
allocated and registered should be released, as already done in the remove
function.
Add a new label, remove the now useless 'err_out_disable_msi' label and
adjust the error handling path accordingly.
Fixes: 1a348ccc1047 ("[NET]: Add Tehuti network driver.")
Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
---
Compile tested only.
---
drivers/net/ethernet/tehuti/tehuti.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index 938a5caf5a3b..6678179885cb 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -1965,7 +1965,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ndev = alloc_etherdev(sizeof(struct bdx_priv));
if (!ndev) {
err = -ENOMEM;
- goto err_out_disable_msi;
+ goto err_out_free;
}
ndev->netdev_ops = &bdx_netdev_ops;
@@ -2031,13 +2031,13 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (bdx_read_mac(priv)) {
pr_err("load MAC address failed\n");
err = -EFAULT;
- goto err_out_disable_msi;
+ goto err_out_free_current;
}
SET_NETDEV_DEV(ndev, &pdev->dev);
err = register_netdev(ndev);
if (err) {
pr_err("register_netdev failed\n");
- goto err_out_free;
+ goto err_out_free_current;
}
netif_carrier_off(ndev);
netif_stop_queue(ndev);
@@ -2046,9 +2046,14 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
RET(0);
-err_out_free:
+err_out_free_current:
free_netdev(ndev);
-err_out_disable_msi:
+err_out_free:
+ while (--port >= 0) {
+ ndev = nic->priv[port]->ndev;
+ unregister_netdev(ndev);
+ free_netdev(ndev);
+ }
#ifdef BDX_MSI
if (nic->irq_type == IRQ_MSI)
pci_disable_msi(pdev);
--
2.43.2
