diff options
| author | Ming Lei <ming.lei@canonical.com> | 2013-03-15 12:08:59 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 10:55:47 -0700 |
| commit | 5410a473fb7a466020af31e8b400c2d14ed94925 (patch) | |
| tree | 8a1ce76da8008c72caecee799b563a6ba55fee58 | |
| parent | 0d41be53f0a65c52f3099d9a4b4fa6e1bca07be8 (diff) | |
| download | op-kernel-dev-5410a473fb7a466020af31e8b400c2d14ed94925.zip op-kernel-dev-5410a473fb7a466020af31e8b400c2d14ed94925.tar.gz | |
usbnet: smsc75xx: don't recover device if suspend fails in system sleep
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.
Also add comments on this case.
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/usb/smsc75xx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 9abe517..21b607a 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -2011,7 +2011,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; } |
