From: Andrew Morton Date: Wed, 14 May 2008 23:20:12 +0000 (-0700) Subject: [netdrvr] dm9000: use delayed work to update mii phy state fix X-Git-Tag: v2.6.26-rc4~7^2~1^2~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5bceeda3253d9ea6a38e2e918362a2610677f9c0;p=linux-2.6-omap-h63xx.git [netdrvr] dm9000: use delayed work to update mii phy state fix use cancel_delayed_work_sync() Cc: Ben Dooks Cc: Enrico Scholz Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index d45bcd2660a..864295e081b 100644 --- a/drivers/net/dm9000.c +++ b/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);