From b705fd45f1fe79e5fa476d5bbbecb086d1d3f23f Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 19 Sep 2006 10:08:43 -0400
Subject: [PATCH] --- yaml --- r: 36451 b: refs/heads/master c:
 592fbbe4bc339399d363dd55f0391e0623400706 h: refs/heads/master i:   36449:
 75ef24497e8064ea97a9890ee4434c48b1a1adc2   36447:
 1f272ca40abd0c7c305bdd18ae304a924ea77dab v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/core/driver.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ede049fd4ca6..73260d19566d 100644
--- 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
index 2b2000ac05ab..0d063c8ca4b4 100644
--- 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 */