4 files changed, 20 insertions, 2 deletions

diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 16c842997291..673e3624713e 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -323,6 +323,11 @@ static int cdc_mbim_suspend(struct usb_interface *intf, pm_message_t message)
                 goto error;
         }
 
+        /*
+         * Both usbnet_suspend() and subdriver->suspend() MUST return 0
+         * in system sleep context, otherwise, the resume callback has
+         * to recover device from previous suspend failure.
+         */
         ret = usbnet_suspend(intf, message);
         if (ret < 0)
                 goto error;
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 968d5d50751d..bdceb7411de3 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -271,6 +271,11 @@ static int qmi_wwan_suspend(struct usb_interface *intf, pm_message_t message)
         struct qmi_wwan_state *info = (void *)&dev->data;
         int ret;
 
+        /*
+         * Both usbnet_suspend() and subdriver->suspend() MUST return 0
+         * in system sleep context, otherwise, the resume callback has
+         * to recover device from previous suspend failure.
+         */
         ret = usbnet_suspend(intf, message);
         if (ret < 0)
                 goto err;
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 1a15ec14c386..75409748c774 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -2015,7 +2015,11 @@ static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
         ret = smsc75xx_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;
 }
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index e6d2dea1373c..3f38ba868f61 100644
--- 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;
 }