unify flush_work/flush_work_keventd and rename it to cancel_work_sync

[powerpc.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 397e25b..637ae8f 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1214,7 +1214,7 @@ e1000_remove(struct pci_dev *pdev)
        int i;
 #endif
 
-       flush_work_keventd(&adapter->reset_task);
+       cancel_work_sync(&adapter->reset_task);
 
        e1000_release_manageability(adapter);