Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / 8139too.c

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index f5166dccd8dfa6b0436eb6397b20e7f05adee58e..98517a373473e18b1a9f6982407831580079263a 100644 (file)
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1092,10 +1092,11 @@ err_out:
 static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata (pdev);
+       struct rtl8139_private *tp = netdev_priv(dev);
 
        assert (dev != NULL);
 
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&tp->thread);
 
        unregister_netdev (dev);