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

Commit 20571d88 authored by Devendra Naga's avatar Devendra Naga Committed by David S. Miller
Browse files

r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one) 



so if mdiobus_alloc fails, the errorpath doesnt do a netif_napi_del and also
doesn't set the priv data of the driver to NULL.

at the driver unload stage the driver doesn't remove the NAPI context, and
doesnt' set the priv data to NULL, and also doesn't call the pci_iounmap.

Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acaf8276

drivers/net/ethernet/rdc/r6040.c

+5 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
err_out_mdio:

	mdiobus_free(lp->mii_bus);

err_out_unmap:

	netif_napi_del(&lp->napi);

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, ioaddr);

err_out_free_res:

	pci_release_regions(pdev);
@@ -1253,6 +1255,9 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev) 
	mdiobus_unregister(lp->mii_bus);

	kfree(lp->mii_bus->irq);

	mdiobus_free(lp->mii_bus);

	netif_napi_del(&lp->napi);

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, lp->base);

	pci_release_regions(pdev);

	free_netdev(dev);

	pci_disable_device(pdev);