diff options
| author | Tejun Heo <tj@kernel.org> | 2011-01-25 08:19:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-25 08:19:10 +0100 |
| commit | 2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4 (patch) | |
| tree | 053239aa3c9db5ead8fd4da70105730685d120e8 | |
| parent | bnx2: Always set ETH_FLAG_TXVLAN (diff) | |
| download | linux-2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4.tar.xz linux-2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4.zip | |
pch_gbe: don't use flush_scheduled_work()
Directly cancel adapter->reset_task instead of using to-be-deprecated
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/pch_gbe/pch_gbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index d7355306a738..1bf12339441b 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c @@ -2247,7 +2247,7 @@ static void pch_gbe_remove(struct pci_dev *pdev) struct net_device *netdev = pci_get_drvdata(pdev); struct pch_gbe_adapter *adapter = netdev_priv(netdev); - flush_scheduled_work(); + cancel_work_sync(&adapter->reset_task); unregister_netdev(netdev); pch_gbe_hal_phy_hw_reset(&adapter->hw); |