aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/netdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 5530d0bdd11a..02d093d1dd5c 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -6028,8 +6028,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
6028 bool down = test_bit(__E1000_DOWN, &adapter->state); 6028 bool down = test_bit(__E1000_DOWN, &adapter->state);
6029 6029
6030 /* 6030 /*
6031 * flush_scheduled work may reschedule our watchdog task, so 6031 * The timers may be rescheduled, so explicitly disable them
6032 * explicitly disable watchdog tasks from being rescheduled 6032 * from being rescheduled.
6033 */ 6033 */
6034 if (!down) 6034 if (!down)
6035 set_bit(__E1000_DOWN, &adapter->state); 6035 set_bit(__E1000_DOWN, &adapter->state);
@@ -6040,8 +6040,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
6040 cancel_work_sync(&adapter->watchdog_task); 6040 cancel_work_sync(&adapter->watchdog_task);
6041 cancel_work_sync(&adapter->downshift_task); 6041 cancel_work_sync(&adapter->downshift_task);
6042 cancel_work_sync(&adapter->update_phy_task); 6042 cancel_work_sync(&adapter->update_phy_task);
6043 cancel_work_sync(&adapter->led_blink_task);
6043 cancel_work_sync(&adapter->print_hang_task); 6044 cancel_work_sync(&adapter->print_hang_task);
6044 flush_scheduled_work();
6045 6045
6046 if (!(netdev->flags & IFF_UP)) 6046 if (!(netdev->flags & IFF_UP))
6047 e1000_power_down_phy(adapter); 6047 e1000_power_down_phy(adapter);