diff options
Diffstat (limited to 'drivers/base/power/resume.c')
-rw-r--r-- | drivers/base/power/resume.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index bdd96b03b885..0a7aa07b9a2a 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c | |||
@@ -26,11 +26,11 @@ int resume_device(struct device * dev) | |||
26 | 26 | ||
27 | down(&dev->sem); | 27 | down(&dev->sem); |
28 | if (dev->power.pm_parent | 28 | if (dev->power.pm_parent |
29 | && dev->power.pm_parent->power.power_state) { | 29 | && dev->power.pm_parent->power.power_state.event) { |
30 | dev_err(dev, "PM: resume from %d, parent %s still %d\n", | 30 | dev_err(dev, "PM: resume from %d, parent %s still %d\n", |
31 | dev->power.power_state, | 31 | dev->power.power_state.event, |
32 | dev->power.pm_parent->bus_id, | 32 | dev->power.pm_parent->bus_id, |
33 | dev->power.pm_parent->power.power_state); | 33 | dev->power.pm_parent->power.power_state.event); |
34 | } | 34 | } |
35 | if (dev->bus && dev->bus->resume) { | 35 | if (dev->bus && dev->bus->resume) { |
36 | dev_dbg(dev,"resuming\n"); | 36 | dev_dbg(dev,"resuming\n"); |
@@ -54,7 +54,7 @@ void dpm_resume(void) | |||
54 | list_add_tail(entry, &dpm_active); | 54 | list_add_tail(entry, &dpm_active); |
55 | 55 | ||
56 | up(&dpm_list_sem); | 56 | up(&dpm_list_sem); |
57 | if (!dev->power.prev_state) | 57 | if (!dev->power.prev_state.event) |
58 | resume_device(dev); | 58 | resume_device(dev); |
59 | down(&dpm_list_sem); | 59 | down(&dpm_list_sem); |
60 | put_device(dev); | 60 | put_device(dev); |