Re: 2.6.7-rc1-mm1: revert leave-runtime-suspended-devices-off-at-system-resume.patch

[Todd Poynor <tpoynor@mvista.com>]

A patch to fix my previous
leave-runtime-suspended-devices-off-at-system-resume patch; the new
changes save a copy of power.power_state in order to know whether to
resume a device, independently of mods to that field by a driver suspend
routine.  This fixes 2.6.7-rc1-mm1 in the same fashion as the updated
2.6.6 patch sent previously.  Thanks -- Todd

--- linux-2.6.7-rc1-mm1.orig/drivers/base/power/suspend.c	2004-05-27 12:18:53.000000000 -0700
+++ linux-2.6.7-rc1-mm1.pm/drivers/base/power/suspend.c	2004-05-28 11:08:10.486982568 -0700
@@ -39,6 +39,8 @@
 {
 	int error = 0;
 
+	dev->power.prev_state = dev->power.power_state;
+
 	if (dev->bus && dev->bus->suspend && !dev->power.power_state)
 		error = dev->bus->suspend(dev,state);
 
--- linux-2.6.7-rc1-mm1.orig/drivers/base/power/resume.c	2004-05-27 12:18:53.000000000 -0700
+++ linux-2.6.7-rc1-mm1.pm/drivers/base/power/resume.c	2004-05-28 11:10:43.792676560 -0700
@@ -36,7 +36,7 @@
 		struct device * dev = to_device(entry);
 		list_del_init(entry);
 
-		if (!dev->power.power_state)
+		if (!dev->power.prev_state)
 			resume_device(dev);
 
 		list_add_tail(entry,&dpm_active);
--- linux-2.6.7-rc1-mm1.orig/include/linux/pm.h	2004-05-27 12:16:59.000000000 -0700
+++ linux-2.6.7-rc1-mm1.pm/include/linux/pm.h	2004-05-28 11:11:50.792491040 -0700
@@ -231,6 +231,7 @@
 struct dev_pm_info {
 	u32			power_state;
 #ifdef	CONFIG_PM
+	u32			prev_state;
 	u8			* saved_state;
 	atomic_t		pm_users;
 	struct device		* pm_parent;