usbnet: smsc95xx: don't recover device if suspend fails in system sleep

If suspend callback fails in system sleep context, usb core will
ignore the failure and let system sleep go ahead further, so
this patch doesn't recover device under this situation.

Also add comments on the case.

Acked-by: David S. Miller <[email protected]>
Cc: Steve Glendinning <[email protected]>
Signed-off-by: Ming Lei <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index e6d2dea1373ce29fcd5275c2d84547c561ba20d0..3f38ba868f6182152093e8efad0a864439c5cef0 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1660,7 +1660,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
        ret = smsc95xx_enter_suspend0(dev);
 
 done:
-       if (ret)
+       /*
+        * TODO: resume() might need to handle the suspend failure
+        * in system sleep
+        */
+       if (ret && PMSG_IS_AUTO(message))
                usbnet_resume(intf);
        return ret;
 }