drivers/net: don't use flush_scheduled_work()

[sfrench/cifs-2.6.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9a1e32fb720bdcddbc6338a9decfbfd54c9516cf..39c17cecb8b98f5258bd9245ad451b14d6b2473b 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -8341,9 +8341,11 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
                return;
        }
 
-       flush_scheduled_work();
-
        sp = netdev_priv(dev);
+
+       cancel_work_sync(&sp->rst_timer_task);
+       cancel_work_sync(&sp->set_link_task);
+
        unregister_netdev(dev);
 
        free_shared_mem(sp);