From 6c533495f6e8a27d56b10942c128b8535fe00472 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 14 May 2008 16:20:12 -0700
Subject: [PATCH] --- yaml --- r: 97341 b: refs/heads/master c:
 5bceeda3253d9ea6a38e2e918362a2610677f9c0 h: refs/heads/master i:   97339:
 21f8326566e7a1b3942c19e6c95799742f2f09da v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/dm9000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9fe294739d47..067a06e37e83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d494eacde8858f9b53f5c640692caf14eb3c8239
+refs/heads/master: 5bceeda3253d9ea6a38e2e918362a2610677f9c0
diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c
index d45bcd2660af..864295e081b6 100644
--- a/trunk/drivers/net/dm9000.c
+++ b/trunk/drivers/net/dm9000.c
@@ -903,7 +903,7 @@ dm9000_stop(struct net_device *ndev)
 	if (netif_msg_ifdown(db))
 		dev_dbg(db->dev, "shutting down %s\n", ndev->name);
 
-	cancel_delayed_work(&db->phy_poll);
+	cancel_delayed_work_sync(&db->phy_poll);
 
 	netif_stop_queue(ndev);
 	netif_carrier_off(ndev);