diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
| commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/dm9000.c | |
| parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 (diff) | |
| parent | bdefff1f54cb76a19700663f211350de2f65cc91 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/dm9000.c')
| -rw-r--r-- | drivers/net/dm9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index d45bcd2660af..864295e081b6 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
| @@ -903,7 +903,7 @@ dm9000_stop(struct net_device *ndev) | |||
| 903 | if (netif_msg_ifdown(db)) | 903 | if (netif_msg_ifdown(db)) |
| 904 | dev_dbg(db->dev, "shutting down %s\n", ndev->name); | 904 | dev_dbg(db->dev, "shutting down %s\n", ndev->name); |
| 905 | 905 | ||
| 906 | cancel_delayed_work(&db->phy_poll); | 906 | cancel_delayed_work_sync(&db->phy_poll); |
| 907 | 907 | ||
| 908 | netif_stop_queue(ndev); | 908 | netif_stop_queue(ndev); |
| 909 | netif_carrier_off(ndev); | 909 | netif_carrier_off(ndev); |