diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
| commit | b4e69ac670d71b5748dc81e536b2cb103489badd (patch) | |
| tree | 26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /drivers/net/pch_gbe/pch_gbe_main.c | |
| parent | net_sched: sch_mqprio: dont leak kernel memory (diff) | |
| parent | xfrm6: Don't forget to propagate peer into ipsec route. (diff) | |
| download | linux-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.tar.xz linux-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/pch_gbe/pch_gbe_main.c')
| -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); |