X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsis190.c;h=3406ed8709176eefebd268fb66bb82b168c8410b;hb=78d07369462e9feeaa5db301b0aa70e9dcb40b48;hp=a5d6a6bd0c1adfae58469ab7f08fe56e14e17d9f;hpb=fa7eadab4b4aec0139d2429e6f8d13375ff8a658;p=deliverable%2Flinux.git

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index a5d6a6bd0c1a..3406ed870917 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1915,9 +1915,10 @@ err_release_board:
 static void __devexit sis190_remove_one(struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
+	struct sis190_private *tp = netdev_priv(dev);
 
 	sis190_mii_remove(dev);
-	flush_scheduled_work();
+	cancel_work_sync(&tp->phy_task);
 	unregister_netdev(dev);
 	sis190_release_board(pdev);
 	pci_set_drvdata(pdev, NULL);