aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2013-03-15 00:08:58 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 13:55:46 -0400
commit0d41be53f0a65c52f3099d9a4b4fa6e1bca07be8 (patch)
tree490acf7a6a3bc9b2b91f63bcb35956ed9c01ed7a /drivers/net
parent81b50be036f91c8502e960c33dca04ac19f96baf (diff)
usbnet: smsc95xx: 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 the 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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/usb/smsc95xx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index e6d2dea1373c..3f38ba868f61 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1660,7 +1660,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
1660 ret = smsc95xx_enter_suspend0(dev); 1660 ret = smsc95xx_enter_suspend0(dev);
1661 1661
1662done: 1662done:
1663 if (ret) 1663 /*
1664 * TODO: resume() might need to handle the suspend failure
1665 * in system sleep
1666 */
1667 if (ret && PMSG_IS_AUTO(message))
1664 usbnet_resume(intf); 1668 usbnet_resume(intf);
1665 return ret; 1669 return ret;
1666} 1670}