OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5c61bd
)
Revert "power_state: get rid of write-only variable in SATA"
author
Jeff Garzik
<jeff@garzik.org>
Mon, 25 Feb 2008 22:31:10 +0000
(17:31 -0500)
committer
Jeff Garzik
<jeff@garzik.org>
Mon, 25 Feb 2008 22:31:10 +0000
(17:31 -0500)
This reverts commit
559bbe6cbd0d8c68d40076a5f7dc98e3bf5864b2
.
Michael S. Tsirkin reports that this changes breaks suspend/resume.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/libata-core.c
patch
|
blob
|
history
diff --git
a/drivers/ata/libata-core.c
b/drivers/ata/libata-core.c
index
b57fad3
..
4fbcce7
100644
(file)
--- 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);