---

yaml --- r: 235413 b: refs/heads/master c: db7c7c0 h: refs/heads/master i: 235411: 1ebacb6 v: v3
git-mirror · Mar 14, 2011 · aa9d7ad · aa9d7ad
1 parent 9e0151b
commit aa9d7ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbf9865c6d96f4a131092d2018056e86113e5cea
+refs/heads/master: db7c7c0aeef51dba12d877875b8deb78d9886647
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
@@ -1659,6 +1659,11 @@ static int usb_runtime_suspend(struct device *dev)
 		return -EAGAIN;
 
 	status = usb_suspend_both(udev, PMSG_AUTO_SUSPEND);
+	/* The PM core reacts badly unless the return code is 0,
+	 * -EAGAIN, or -EBUSY, so always return -EBUSY on an error.
+	 */
+	if (status != 0)
+		return -EBUSY;
 	return status;
 }