diff options
| author |   Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-07 14:11:48 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-06-07 19:45:34 -0700 |
| commit | 1489bdeeae1a47171926e255956c9fc251db13a0 (patch) | |
| tree | 89bc48d3cb8f6c736e56071d488a3dd5420eb0b3 /drivers/net/ethernet/broadcom | |
| parent | bridge: disable softirqs around br_fdb_update to avoid lockup (diff) | |
| download | linux-dev-1489bdeeae1a47171926e255956c9fc251db13a0.tar.xz linux-dev-1489bdeeae1a47171926e255956c9fc251db13a0.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -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: ssb_bus_may_powerdown(sdev->bus); err_out_free_dev: + netif_napi_del(&bp->napi); free_netdev(dev); out: @@ -2480,6 +2481,7 @@ static void b44_remove_one(struct ssb_device *sdev) b44_unregister_phy_one(bp); ssb_device_disable(sdev, 0); ssb_bus_may_powerdown(sdev->bus); + netif_napi_del(&bp->napi); free_netdev(dev); ssb_pcihost_set_power_state(sdev, PCI_D3hot); ssb_set_drvdata(sdev, NULL); |