diff options
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 4106a743ca74..b5eb4195fc99 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -3689,7 +3689,7 @@ static void rtl_phy_work(struct rtl8169_private *tp) | |||
3689 | if (tp->link_ok(ioaddr)) | 3689 | if (tp->link_ok(ioaddr)) |
3690 | return; | 3690 | return; |
3691 | 3691 | ||
3692 | netif_warn(tp, link, tp->dev, "PHY reset until link up\n"); | 3692 | netif_dbg(tp, link, tp->dev, "PHY reset until link up\n"); |
3693 | 3693 | ||
3694 | tp->phy_reset_enable(tp); | 3694 | tp->phy_reset_enable(tp); |
3695 | 3695 | ||
@@ -6468,6 +6468,8 @@ static int rtl8169_close(struct net_device *dev) | |||
6468 | rtl8169_down(dev); | 6468 | rtl8169_down(dev); |
6469 | rtl_unlock_work(tp); | 6469 | rtl_unlock_work(tp); |
6470 | 6470 | ||
6471 | cancel_work_sync(&tp->wk.work); | ||
6472 | |||
6471 | free_irq(pdev->irq, dev); | 6473 | free_irq(pdev->irq, dev); |
6472 | 6474 | ||
6473 | dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, | 6475 | dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, |
@@ -6793,8 +6795,6 @@ static void rtl_remove_one(struct pci_dev *pdev) | |||
6793 | rtl8168_driver_stop(tp); | 6795 | rtl8168_driver_stop(tp); |
6794 | } | 6796 | } |
6795 | 6797 | ||
6796 | cancel_work_sync(&tp->wk.work); | ||
6797 | |||
6798 | netif_napi_del(&tp->napi); | 6798 | netif_napi_del(&tp->napi); |
6799 | 6799 | ||
6800 | unregister_netdev(dev); | 6800 | unregister_netdev(dev); |