Merge tag 'usb-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[~andy/linux] / drivers / net / usb / qmi_wwan.c

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 2a3579f679103da7864260f114f98419852eaecd..5a88e72090ce7d0709d024a8c4b1f8fc173063a9 100644 (file)
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -374,6 +374,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;