Commit 0d41be53 authored Mar 15, 2013 by Ming Lei Committed by Greg Kroah-Hartman Mar 25, 2013

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>

parent 81b50be0

drivers/net/usb/smsc95xx.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1660,7 +1660,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
		ret = smsc95xx_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;
		}