diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 05:14:45 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 05:14:45 +0200 |
| commit | 4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch) | |
| tree | 36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/base/power/suspend.c | |
| parent | drm: add radeon PCI express support (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip | |
update from upstream
Diffstat (limited to 'drivers/base/power/suspend.c')
| -rw-r--r-- | drivers/base/power/suspend.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 2ccee3763acf..50501764d050 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c @@ -40,22 +40,22 @@ int suspend_device(struct device * dev, pm_message_t state) int error = 0; down(&dev->sem); - if (dev->power.power_state) { + if (dev->power.power_state.event) { dev_dbg(dev, "PM: suspend %d-->%d\n", - dev->power.power_state, state); + dev->power.power_state.event, state.event); } if (dev->power.pm_parent - && dev->power.pm_parent->power.power_state) { + && dev->power.pm_parent->power.power_state.event) { dev_err(dev, "PM: suspend %d->%d, parent %s already %d\n", - dev->power.power_state, state, + dev->power.power_state.event, state.event, dev->power.pm_parent->bus_id, - dev->power.pm_parent->power.power_state); + dev->power.pm_parent->power.power_state.event); } dev->power.prev_state = dev->power.power_state; - if (dev->bus && dev->bus->suspend && !dev->power.power_state) { + if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) { dev_dbg(dev, "suspending\n"); error = dev->bus->suspend(dev, state); } |