diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-07 08:11:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-07 22:45:34 -0400 |
commit | 1489bdeeae1a47171926e255956c9fc251db13a0 (patch) | |
tree | 89bc48d3cb8f6c736e56071d488a3dd5420eb0b3 | |
parent | c4c832f89dc468cf11dc0dd17206bace44526651 (diff) |
b44: call netif_napi_del()
When the driver gets unregistered a call to netif_napi_del() was
missing, this all was also missing in the error paths of
b44_init_one().
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 77363d680532..a3b1c07ae0af 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
@@ -2464,6 +2464,7 @@ err_out_powerdown: | |||
2464 | ssb_bus_may_powerdown(sdev->bus); | 2464 | ssb_bus_may_powerdown(sdev->bus); |
2465 | 2465 | ||
2466 | err_out_free_dev: | 2466 | err_out_free_dev: |
2467 | netif_napi_del(&bp->napi); | ||
2467 | free_netdev(dev); | 2468 | free_netdev(dev); |
2468 | 2469 | ||
2469 | out: | 2470 | out: |
@@ -2480,6 +2481,7 @@ static void b44_remove_one(struct ssb_device *sdev) | |||
2480 | b44_unregister_phy_one(bp); | 2481 | b44_unregister_phy_one(bp); |
2481 | ssb_device_disable(sdev, 0); | 2482 | ssb_device_disable(sdev, 0); |
2482 | ssb_bus_may_powerdown(sdev->bus); | 2483 | ssb_bus_may_powerdown(sdev->bus); |
2484 | netif_napi_del(&bp->napi); | ||
2483 | free_netdev(dev); | 2485 | free_netdev(dev); |
2484 | ssb_pcihost_set_power_state(sdev, PCI_D3hot); | 2486 | ssb_pcihost_set_power_state(sdev, PCI_D3hot); |
2485 | ssb_set_drvdata(sdev, NULL); | 2487 | ssb_set_drvdata(sdev, NULL); |