From: Ming Lei Date: Fri, 15 Mar 2013 04:08:57 +0000 (+0800) Subject: usbnet: qmi_wwan: comments on suspend failure X-Git-Tag: v3.10-rc1~190^2~221 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=81b50be036f91c8502e960c33dca04ac19f96baf;p=~emulex%2Finfiniband.git usbnet: qmi_wwan: comments on suspend failure If suspend callback fails in system sleep context, usb core will ignore the failure and let system sleep go ahead further, so this patch comments on the case and requires that both usbnet_suspend() and subdriver->suspend() MUST return 0 in system sleep context. Acked-by: David S. Miller Acked-by: Bjørn Mork Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 968d5d50751..bdceb7411de 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;