File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed
drivers/net/ethernet/intel/e1000 Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -477,10 +477,6 @@ static void e1000_down_and_stop(struct e1000_adapter *adapter)
477
477
478
478
cancel_delayed_work_sync (& adapter -> phy_info_task );
479
479
cancel_delayed_work_sync (& adapter -> fifo_stall_task );
480
-
481
- /* Only kill reset task if adapter is not resetting */
482
- if (!test_bit (__E1000_RESETTING , & adapter -> flags ))
483
- cancel_work_sync (& adapter -> reset_task );
484
480
}
485
481
486
482
void e1000_down (struct e1000_adapter * adapter )
@@ -1266,6 +1262,10 @@ static void e1000_remove(struct pci_dev *pdev)
1266
1262
1267
1263
unregister_netdev (netdev );
1268
1264
1265
+ /* Only kill reset task if adapter is not resetting */
1266
+ if (!test_bit (__E1000_RESETTING , & adapter -> flags ))
1267
+ cancel_work_sync (& adapter -> reset_task );
1268
+
1269
1269
e1000_phy_hw_reset (hw );
1270
1270
1271
1271
kfree (adapter -> tx_ring );
You can’t perform that action at this time.
0 commit comments