diff options
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 06bb9b799458..e209efaa01b9 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -1279,7 +1279,7 @@ static void emac_force_link_update(struct emac_instance *dev) | |||
1279 | netif_carrier_off(dev->ndev); | 1279 | netif_carrier_off(dev->ndev); |
1280 | smp_rmb(); | 1280 | smp_rmb(); |
1281 | if (dev->link_polling) { | 1281 | if (dev->link_polling) { |
1282 | cancel_rearming_delayed_work(&dev->link_work); | 1282 | cancel_delayed_work_sync(&dev->link_work); |
1283 | if (dev->link_polling) | 1283 | if (dev->link_polling) |
1284 | schedule_delayed_work(&dev->link_work, PHY_POLL_LINK_OFF); | 1284 | schedule_delayed_work(&dev->link_work, PHY_POLL_LINK_OFF); |
1285 | } | 1285 | } |
@@ -1294,7 +1294,7 @@ static int emac_close(struct net_device *ndev) | |||
1294 | 1294 | ||
1295 | if (dev->phy.address >= 0) { | 1295 | if (dev->phy.address >= 0) { |
1296 | dev->link_polling = 0; | 1296 | dev->link_polling = 0; |
1297 | cancel_rearming_delayed_work(&dev->link_work); | 1297 | cancel_delayed_work_sync(&dev->link_work); |
1298 | } | 1298 | } |
1299 | mutex_lock(&dev->link_lock); | 1299 | mutex_lock(&dev->link_lock); |
1300 | emac_netif_stop(dev); | 1300 | emac_netif_stop(dev); |