git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
base
/
power
/
resume.c
diff --git
a/drivers/base/power/resume.c
b/drivers/base/power/resume.c
index
637c52a
..
21d4b56
100644
(file)
--- a/
drivers/base/power/resume.c
+++ b/
drivers/base/power/resume.c
@@
-35,7
+35,10
@@
void dpm_resume(void)
struct list_head * entry = dpm_off.next;
struct device * dev = to_device(entry);
list_del_init(entry);
- resume_device(dev);
+
+ if (!dev->power.prev_state)
+ resume_device(dev);
+
list_add_tail(entry,&dpm_active);
}
}