Pārlūkot izejas kodu

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>
Ming Lei 12 gadi atpakaļ
vecāks
revīzija
0d41be53f0
1 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 5 1
      drivers/net/usb/smsc95xx.c

+ 5 - 1
drivers/net/usb/smsc95xx.c

@@ -1660,7 +1660,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
 	ret = smsc95xx_enter_suspend0(dev);
 	ret = smsc95xx_enter_suspend0(dev);
 
 
 done:
 done:
-	if (ret)
+	/*
+	 * TODO: resume() might need to handle the suspend failure
+	 * in system sleep
+	 */
+	if (ret && PMSG_IS_AUTO(message))
 		usbnet_resume(intf);
 		usbnet_resume(intf);
 	return ret;
 	return ret;
 }
 }