From 6ce89ee02f0a575065f1be25fe53181600968f31 Mon Sep 17 00:00:00 2001
From: Aaron Lu <aaron.lu@intel.com>
Date: Tue, 15 Jan 2013 17:21:02 +0800
Subject: [PATCH] --- yaml --- r: 356950 b: refs/heads/master c:
 a59b9aae230316134597775c6202cf28f6da0333 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 357f4cce6e3c..31f0d7ba79d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213342053db58eabdaddff9c036c2b81ca63c443
+refs/heads/master: a59b9aae230316134597775c6202cf28f6da0333
diff --git a/trunk/drivers/ata/libata-acpi.c b/trunk/drivers/ata/libata-acpi.c
index 6f72c648ea14..97094496127e 100644
--- a/trunk/drivers/ata/libata-acpi.c
+++ b/trunk/drivers/ata/libata-acpi.c
@@ -17,6 +17,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_qos.h>
 #include <scsi/scsi_device.h>
 #include "libata.h"
 
@@ -1022,6 +1023,8 @@ static void ata_acpi_unregister_power_resource(struct ata_device *dev)
 void ata_acpi_bind(struct ata_device *dev)
 {
 	ata_acpi_register_power_resource(dev);
+	if (zpodd_dev_enabled(dev))
+		dev_pm_qos_expose_flags(&dev->sdev->sdev_gendev, 0);
 }
 
 void ata_acpi_unbind(struct ata_device *dev)
diff --git a/trunk/drivers/ata/libata-zpodd.c b/trunk/drivers/ata/libata-zpodd.c
index 1f5d52ae3974..540b0b7904fb 100644
--- a/trunk/drivers/ata/libata-zpodd.c
+++ b/trunk/drivers/ata/libata-zpodd.c
@@ -150,6 +150,7 @@ void zpodd_on_suspend(struct ata_device *dev)
 
 	if (!zpready(dev)) {
 		zpodd->zp_sampled = false;
+		zpodd->zp_ready = false;
 		return;
 	}