On Tue, Mar 5, 2013 at 3:09 PM, Bjørn Mork <bjorn@xxxxxxx> wrote: > 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..fce18be 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(msg)) >> usbnet_resume(intf); >> err: >> return ret; > > > NAK. We if the device cannot suspend, then it cannot do suspend halfways > either. Whether the caller will ignore the error or not, is irrelevant. See my same comments on 4/7. Thanks, -- Ming Lei -- 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
