[PATCH net] r8152: use cancel_delayed_work for runtime suspend
From: Hayes Wang <hidden>
Date: 2014-10-17 05:55:46
Also in:
lkml
Subsystem:
networking drivers, the rest, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
It would cause dead lock for runtime suspend, when the workqueue is running and runtime suspend occurs before the workqueue wakes up the device. The rtl8152_suspend() waits the workqueue to finish because of calling cancel_delayed_work_sync(). The workqueue waits the suspend function to finish for waking up the device because of calling usb_autopm_get_interface(). Signed-off-by: Hayes Wang <redacted> --- drivers/net/usb/r8152.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 864159e..7d4e55a 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c@@ -3200,12 +3200,13 @@ static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message) if (netif_running(tp->netdev)) { clear_bit(WORK_ENABLE, &tp->flags); usb_kill_urb(tp->intr_urb); - cancel_delayed_work_sync(&tp->schedule); tasklet_disable(&tp->tl); if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) { + cancel_delayed_work(&tp->schedule); rtl_stop_rx(tp); rtl_runtime_suspend_enable(tp, true); } else { + cancel_delayed_work_sync(&tp->schedule); tp->rtl_ops.down(tp); } tasklet_enable(&tp->tl);
--
1.9.3