Commit 4ea72445 authored by Lekensteyn's avatar Lekensteyn Committed by David S. Miller

r8169: fix lockdep warning when removing interface

The work queue is initialised in rtl_open (when the interface goes up),
but canceled in rtl_remove_one (when the PCI device gets removed). If
the network interface is not brought up, then the work queue struct is
not initialised. When the device is removed, the attempt to cancel the
uninitialised work queue causes a lockdep warning.

This patch fixes the issue by moving cancel_work_sync to rtl_close (to
match rtl_open). (Note that rtl_close is also called via
unregister_netdev in rtl_remove_one.)
Signed-off-by: default avatarPeter Wu <lekensteyn@gmail.com>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8c0aca9
...@@ -6468,6 +6468,8 @@ static int rtl8169_close(struct net_device *dev) ...@@ -6468,6 +6468,8 @@ static int rtl8169_close(struct net_device *dev)
rtl8169_down(dev); rtl8169_down(dev);
rtl_unlock_work(tp); rtl_unlock_work(tp);
cancel_work_sync(&tp->wk.work);
free_irq(pdev->irq, dev); free_irq(pdev->irq, dev);
dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray, 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,8 +6795,6 @@ static void rtl_remove_one(struct pci_dev *pdev)
rtl8168_driver_stop(tp); rtl8168_driver_stop(tp);
} }
cancel_work_sync(&tp->wk.work);
netif_napi_del(&tp->napi); netif_napi_del(&tp->napi);
unregister_netdev(dev); unregister_netdev(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment