diff options
Diffstat (limited to 'drivers/base/power/resume.c')
-rw-r--r-- | drivers/base/power/resume.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index f6cfea496ea0..99679e7a6cc6 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c | |||
@@ -29,12 +29,11 @@ int resume_device(struct device * dev) | |||
29 | 29 | ||
30 | down(&dev->sem); | 30 | down(&dev->sem); |
31 | 31 | ||
32 | if (dev->power.pm_parent | 32 | if (dev->parent && dev->parent->power.power_state.event) { |
33 | && dev->power.pm_parent->power.power_state.event) { | ||
34 | dev_err(dev, "PM: resume from %d, parent %s still %d\n", | 33 | dev_err(dev, "PM: resume from %d, parent %s still %d\n", |
35 | dev->power.power_state.event, | 34 | dev->power.power_state.event, |
36 | dev->power.pm_parent->bus_id, | 35 | dev->parent->bus_id, |
37 | dev->power.pm_parent->power.power_state.event); | 36 | dev->parent->power.power_state.event); |
38 | } | 37 | } |
39 | 38 | ||
40 | if (dev->bus && dev->bus->resume) { | 39 | if (dev->bus && dev->bus->resume) { |