diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-02-25 17:31:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-25 17:31:10 -0500 |
| commit | 72ad6ec48989d4b5477128e739b960be11155036 (patch) | |
| tree | 33e30ece72786a88b90847828b273a5438763808 /drivers/ata | |
| parent | c5c61bda5ecceaa0f16d326cd2c2147468a4c443 (diff) | |
| download | blackbird-op-linux-72ad6ec48989d4b5477128e739b960be11155036.tar.gz blackbird-op-linux-72ad6ec48989d4b5477128e739b960be11155036.zip | |
Revert "power_state: get rid of write-only variable in SATA"
This reverts commit 559bbe6cbd0d8c68d40076a5f7dc98e3bf5864b2.
Michael S. Tsirkin reports that this changes breaks suspend/resume.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b57fad3eb24c..4fbcce758b04 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -6567,6 +6567,8 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg) ata_lpm_enable(host); rc = ata_host_request_pm(host, mesg, 0, ATA_EHI_QUIET, 1); + if (rc == 0) + host->dev->power.power_state = mesg; return rc; } @@ -6585,6 +6587,7 @@ void ata_host_resume(struct ata_host *host) { ata_host_request_pm(host, PMSG_ON, ATA_EH_SOFTRESET, ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 0); + host->dev->power.power_state = PMSG_ON; /* reenable link pm */ ata_lpm_disable(host); |
