Commit ad1be8d3 authored May 31, 2012 by Devendra Naga Committed by David S. Miller Jun 01, 2012

r8169: call netif_napi_del at errpaths and at driver unload

when register_netdev fails, the init'ed NAPIs by netif_napi_add must be
deleted with netif_napi_del, and also when driver unloads, it should
delete the NAPI before unregistering netdevice using unregister_netdev.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fff32699

drivers/net/ethernet/realtek/r8169.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -6345,6 +6345,8 @@ static void __devexit rtl_remove_one(struct pci_dev *pdev)

		cancel_work_sync(&tp->wk.work);

		netif_napi_del(&tp->napi);

		unregister_netdev(dev);

		rtl_release_firmware(tp);
		@@ -6668,6 +6670,7 @@ rtl_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		return rc;

		err_out_msi_4:
		netif_napi_del(&tp->napi);
		rtl_disable_msi(pdev, tp);
		iounmap(ioaddr);
		err_out_free_res_3: