Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb

[linux-beck.git] / drivers / net / usb / r8152.c

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 864159eb744eb3ac0127070f10aaed82a610a0e6..e3d84c322e4ec2589d496ad9a6355bd14e08da31 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3189,31 +3189,39 @@ static void r8153_init(struct r8152 *tp)
 static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
 {
        struct r8152 *tp = usb_get_intfdata(intf);
+       struct net_device *netdev = tp->netdev;
+       int ret = 0;
 
        mutex_lock(&tp->control);
 
-       if (PMSG_IS_AUTO(message))
+       if (PMSG_IS_AUTO(message)) {
+               if (netif_running(netdev) && work_busy(&tp->schedule.work)) {
+                       ret = -EBUSY;
+                       goto out1;
+               }
+
                set_bit(SELECTIVE_SUSPEND, &tp->flags);
-       else
-               netif_device_detach(tp->netdev);
+       } else {
+               netif_device_detach(netdev);
+       }
 
-       if (netif_running(tp->netdev)) {
+       if (netif_running(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)) {
                        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);
        }
-
+out1:
        mutex_unlock(&tp->control);
 
-       return 0;
+       return ret;
 }
 
 static int rtl8152_resume(struct usb_interface *intf)