diff options
author | Sathya Perla <sathya.perla@emulex.com> | 2011-03-21 16:49:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-31 00:39:21 -0400 |
commit | 0f4a682882171d81c9e3c33c1094b87a197c09fa (patch) | |
tree | dec1901e434012d930c58c240f337b0966fbd4d2 /drivers/net/benet | |
parent | 16da8250df36547269d20a3d53daa11c79f59637 (diff) |
be2net: cancel be_worker in be_shutdown() even when i/f is down
As the be_worker() workqueue is scheduled in be_probe() it must
be canceled unconditionally in be_shutdown().
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r-- | drivers/net/benet/be_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 3bf79d148c24..86389133dd3c 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -3155,8 +3155,7 @@ static void be_shutdown(struct pci_dev *pdev) | |||
3155 | struct be_adapter *adapter = pci_get_drvdata(pdev); | 3155 | struct be_adapter *adapter = pci_get_drvdata(pdev); |
3156 | struct net_device *netdev = adapter->netdev; | 3156 | struct net_device *netdev = adapter->netdev; |
3157 | 3157 | ||
3158 | if (netif_running(netdev)) | 3158 | cancel_delayed_work_sync(&adapter->work); |
3159 | cancel_delayed_work_sync(&adapter->work); | ||
3160 | 3159 | ||
3161 | netif_device_detach(netdev); | 3160 | netif_device_detach(netdev); |
3162 | 3161 | ||