Ming Lei <ming.lei@xxxxxxxxxxxxx> writes: > 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. > > Cc: Bjørn Mork <bjorn@xxxxxxx> > Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx> > --- > drivers/net/usb/qmi_wwan.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c > index efb5c7c..1b4367c 100644 > --- a/drivers/net/usb/qmi_wwan.c > +++ b/drivers/net/usb/qmi_wwan.c > @@ -294,7 +294,7 @@ static int qmi_wwan_suspend(struct usb_interface *intf, pm_message_t message) > > if (intf == info->control && info->subdriver && info->subdriver->suspend) > ret = info->subdriver->suspend(intf, message); > - if (ret < 0) > + if (ret < 0 && PMSG_IS_AUTO(message)) > usbnet_resume(intf); > err: > return ret; Same comment as for cdc_mbim: This is more confusing than helpful because it makes it look like qmi_wwan_suspend can return an error on system suspend. Better adding a comment explaining why the original code is OK. Bjørn -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
