From 59ca77966f91085cb9fe24f0f7860687eee13ed3 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 25 Feb 2008 17:31:10 -0500
Subject: [PATCH] --- yaml --- r: 86379 b: refs/heads/master c:
 72ad6ec48989d4b5477128e739b960be11155036 h: refs/heads/master i:   86377:
 edcf1f002f954c84874fc67050aa2333dee1a522   86375:
 244bee48a7d6b630704006bf66ad5a0f421b30ca v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 700dbb8df650..cc487022ff49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5c61bda5ecceaa0f16d326cd2c2147468a4c443
+refs/heads/master: 72ad6ec48989d4b5477128e739b960be11155036
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index b57fad3eb24c..4fbcce758b04 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/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);