---

yaml --- r: 364368 b: refs/heads/master c: 5410a47 h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · dc40a31 · dc40a31
1 parent 77d6701
commit dc40a31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d41be53f0a65c52f3099d9a4b4fa6e1bca07be8
+refs/heads/master: 5410a473fb7a466020af31e8b400c2d14ed94925
diff --git a/trunk/drivers/net/usb/smsc75xx.c b/trunk/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;
 }