diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/ide/ide-io.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 248e3cc8b352..f174aee659e5 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -150,7 +150,7 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s | |||
| 150 | 150 | ||
| 151 | switch (rq->pm->pm_step) { | 151 | switch (rq->pm->pm_step) { |
| 152 | case ide_pm_flush_cache: /* Suspend step 1 (flush cache) complete */ | 152 | case ide_pm_flush_cache: /* Suspend step 1 (flush cache) complete */ |
| 153 | if (rq->pm->pm_state == 4) | 153 | if (rq->pm->pm_state == PM_EVENT_FREEZE) |
| 154 | rq->pm->pm_step = ide_pm_state_completed; | 154 | rq->pm->pm_step = ide_pm_state_completed; |
| 155 | else | 155 | else |
| 156 | rq->pm->pm_step = idedisk_pm_standby; | 156 | rq->pm->pm_step = idedisk_pm_standby; |