---

yaml --- r: 356950 b: refs/heads/master c: a59b9aa h: refs/heads/master v: v3
git-mirror · Jan 21, 2013 · 6ce89ee · 6ce89ee
1 parent 7b81676
commit 6ce89ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -150,6 +150,7 @@ void zpodd_on_suspend(struct ata_device *dev)
 
 	if (!zpready(dev)) {
 		zpodd->zp_sampled = false;
+		zpodd->zp_ready = false;
 		return;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,7 @@ void zpodd_on_suspend(struct ata_device *dev) @@
     	if (!zpready(dev)) {
     		zpodd->zp_sampled = false;
+    		zpodd->zp_ready = false;
     		return;
     	}
@@ Expand Down @@