---

yaml --- r: 36451 b: refs/heads/master c: 592fbbe h: refs/heads/master i: 36449: 75ef244 36447: 1f272ca v: v3
git-mirror · Sep 27, 2006 · b705fd4 · b705fd4
1 parent 6471369
commit b705fd4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02c399ee45a54987c152fe5f627ed949bb55f187
+refs/heads/master: 592fbbe4bc339399d363dd55f0391e0623400706
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
@@ -1071,10 +1071,15 @@ int usb_resume_both(struct usb_device *udev)
 					PM_EVENT_ON)
 				status = -EHOSTUNREACH;
 		}
-		if (status == 0 && udev->state == USB_STATE_SUSPENDED)
+		if (status == 0)
 			status = resume_device(udev);
 		if (parent)
 			mutex_unlock(&parent->pm_mutex);
+	} else {
+
+		/* Needed only for setting udev->dev.power.power_state.event
+		 * and for possible debugging message. */
+		status = resume_device(udev);
 	}
 
 	/* Now the parent won't suspend until we are finished */