diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 16:37:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 16:37:46 -0700 |
| commit | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (patch) | |
| tree | 46ae0ec07caf01fa5c743112ae8ee932d1e66854 /drivers/base/power/resume.c | |
| parent | 301216244b1e39c4346e56d38b079ca53d528580 (diff) | |
| parent | 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab (diff) | |
| download | op-kernel-dev-05d3794aa8bd3b2c9f7920a05003c331cdeb75c5.zip op-kernel-dev-05d3794aa8bd3b2c9f7920a05003c331cdeb75c5.tar.gz | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Diffstat (limited to 'drivers/base/power/resume.c')
| -rw-r--r-- | drivers/base/power/resume.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index f8f5055..2646897 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c @@ -22,8 +22,17 @@ extern int sysdev_resume(void); int resume_device(struct device * dev) { - if (dev->bus && dev->bus->resume) + if (dev->power.pm_parent + && dev->power.pm_parent->power.power_state) { + dev_err(dev, "PM: resume from %d, parent %s still %d\n", + dev->power.power_state, + dev->power.pm_parent->bus_id, + dev->power.pm_parent->power.power_state); + } + if (dev->bus && dev->bus->resume) { + dev_dbg(dev,"resuming\n"); return dev->bus->resume(dev); + } return 0; } |
