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);