]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/net/usb/smsc95xx.c
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...
[karo-tx-linux.git] / drivers / net / usb / smsc95xx.c
index e6d2dea1373ce29fcd5275c2d84547c561ba20d0..3f38ba868f6182152093e8efad0a864439c5cef0 100644 (file)
@@ -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;
 }