diff options
| author |   Sathya Perla <sathya.perla@emulex.com> | 2011-03-21 20:49:28 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-03-30 21:39:21 -0700 |
| commit | 0f4a682882171d81c9e3c33c1094b87a197c09fa (patch) | |
| tree | dec1901e434012d930c58c240f337b0966fbd4d2 /drivers | |
| parent | be2net: remove redundant code in be_worker() (diff) | |
| download | linux-dev-0f4a682882171d81c9e3c33c1094b87a197c09fa.tar.xz linux-dev-0f4a682882171d81c9e3c33c1094b87a197c09fa.zip | |
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')
| -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) struct be_adapter *adapter = pci_get_drvdata(pdev); struct net_device *netdev = adapter->netdev; - if (netif_running(netdev)) - cancel_delayed_work_sync(&adapter->work); + cancel_delayed_work_sync(&adapter->work); netif_device_detach(netdev); |