---

yaml --- r: 213629 b: refs/heads/master c: 7491f13 h: refs/heads/master i: 213627: 593b663 v: v3
git-mirror · Oct 22, 2010 · 36d11de · 36d11de
1 parent c33ac64
commit 36d11de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00914025cc4e783d4703b4db1d47b41f389e50c8
+refs/heads/master: 7491f13367919d97525b73b1fd38801ac83aac06
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
@@ -1337,7 +1337,7 @@ int usb_resume(struct device *dev, pm_message_t msg)
 	/* Avoid PM error messages for devices disconnected while suspended
 	 * as we'll display regular disconnect messages just a bit later.
 	 */
-	if (status == -ENODEV)
+	if (status == -ENODEV || status == -ESHUTDOWN)
 		status = 0;
 	return status;
 }