Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3de4e301 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Fix missing cleanup in failure path of efx_pci_probe() 



We need to clear the private data pointer in the PCI device.
Also reorder cleanup in efx_pci_remove() for symmetry.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 3dca9d2d

drivers/net/ethernet/sfc/efx.c

+2 −1
Original line number Diff line number Diff line
@@ -2497,8 +2497,8 @@ static void efx_pci_remove(struct pci_dev *pci_dev) 
	efx_fini_io(efx);

	netif_dbg(efx, drv, efx->net_dev, "shutdown successful\n");



	pci_set_drvdata(pci_dev, NULL);

	efx_fini_struct(efx);

	pci_set_drvdata(pci_dev, NULL);

	free_netdev(efx->net_dev);

};
@@ -2700,6 +2700,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, 
 fail2:

	efx_fini_struct(efx);

 fail1:

	pci_set_drvdata(pci_dev, NULL);

	WARN_ON(rc > 0);

	netif_dbg(efx, drv, efx->net_dev, "initialisation failed. rc=%d\n", rc);

	free_netdev(net_dev);