unify flush_work/flush_work_keventd and rename it to cancel_work_sync

[mirror_ubuntu-artful-kernel.git] / drivers / net / tg3.c

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0c0f9c81732136e1ee23b5ea98dbf332ba82b14f..923b9c725cc3f4e5cd75434914dbb4ce466c151f 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7386,7 +7386,7 @@ static int tg3_close(struct net_device *dev)
 {
        struct tg3 *tp = netdev_priv(dev);
 
-       flush_work_keventd(&tp->reset_task);
+       cancel_work_sync(&tp->reset_task);
 
        netif_stop_queue(dev);