---

yaml --- r: 299139 b: refs/heads/master c: cd4376e h: refs/heads/master i: 299137: 67f5ae2 299135: 140c524 v: v3
git-mirror · Apr 9, 2012 · bf77007 · bf77007
1 parent 49c6430
commit bf77007
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891a3b1fddb24b4b53426685bd0390bb74c9b5b3
+refs/heads/master: cd4376e23a59a2adf3084cb5f4a523e6d5fd4e49
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
@@ -1189,8 +1189,13 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
 	if (status == 0) {
 		status = usb_suspend_device(udev, msg);
 
-		/* Again, ignore errors during system sleep transitions */
-		if (!PMSG_IS_AUTO(msg))
+		/*
+		 * Ignore errors from non-root-hub devices during
+		 * system sleep transitions.  For the most part,
+		 * these devices should go to low power anyway when
+		 * the entire bus is suspended.
+		 */
+		if (udev->parent && !PMSG_IS_AUTO(msg))
 			status = 0;
 	}