From 3d0709aa8e678bc520e2004282575e3ff24e779b Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 24 Jan 2011 23:19:10 -0800 Subject: [PATCH] --- yaml --- r: 232461 b: refs/heads/master c: 2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4 h: refs/heads/master i: 232459: 8f94d5bfb7bfd7b7918d8eab1544c417ad29a4ac v: v3 --- [refs] | 2 +- trunk/drivers/net/pch_gbe/pch_gbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1c6aeea7d6f..9c725be80283 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c8104774e59549c37dd1cb0a8ec4f131094664c +refs/heads/master: 2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4 diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_main.c b/trunk/drivers/net/pch_gbe/pch_gbe_main.c index d7355306a738..1bf12339441b 100644 --- a/trunk/drivers/net/pch_gbe/pch_gbe_main.c +++ b/trunk/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);