---

yaml --- r: 59103 b: refs/heads/master c: 515c535 h: refs/heads/master i: 59101: e335cf9 59099: e18f2f3 59095: 7957400 59087: 9d404e1 59071: 13ccb5a v: v3
git-mirror · Jul 11, 2007 · e33a4e4 · e33a4e4
1 parent 10f98f2
commit e33a4e4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a0134554e12f530c6eccb1dab3f0f8954f855c9
+refs/heads/master: 515c53576299e32d6bdb6295cfa2fe1307516eb4
diff --git a/trunk/drivers/base/power/resume.c b/trunk/drivers/base/power/resume.c
@@ -88,8 +88,7 @@ void dpm_resume(void)
 		list_move_tail(entry, &dpm_active);
 
 		mutex_unlock(&dpm_list_mtx);
-		if (!dev->power.prev_state.event)
-			resume_device(dev);
+		resume_device(dev);
 		mutex_lock(&dpm_list_mtx);
 		put_device(dev);
 	}

diff --git a/trunk/drivers/base/power/suspend.c b/trunk/drivers/base/power/suspend.c
@@ -71,8 +71,6 @@ int suspend_device(struct device * dev, pm_message_t state)
 			dev->parent->power.power_state.event);
 	}
 
-	dev->power.prev_state = dev->power.power_state;
-
 	if (dev->class && dev->class->suspend && !dev->power.power_state.event) {
 		suspend_device_dbg(dev, state, "class ");
 		error = dev->class->suspend(dev, state);

diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
@@ -1109,11 +1109,6 @@ void usb_root_hub_lost_power(struct usb_device *rhdev)
 
 	dev_warn(&rhdev->dev, "root hub lost power or was reset\n");
 
-	/* Make sure no potential wakeup events get lost,
-	 * by forcing the root hub to be resumed.
-	 */
-	rhdev->dev.power.prev_state.event = PM_EVENT_ON;
-
 	spin_lock_irqsave(&device_state_lock, flags);
 	hub = hdev_to_hub(rhdev);
 	for (port1 = 1; port1 <= rhdev->maxchild; ++port1) {

diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h
@@ -267,7 +267,6 @@ struct dev_pm_info {
 	unsigned		can_wakeup:1;
 #ifdef	CONFIG_PM
 	unsigned		should_wakeup:1;
-	pm_message_t		prev_state;
 	struct list_head	entry;
 #endif
 };