diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 27a84de..61a90de 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -840,7 +840,8 @@ static int ata_acpi_choose_state(struct ata_device *dev)
 
 	if (zpodd_dev_enabled(dev)) {
 		if (zpodd_poweroff_ready(dev))
-			dev_pm_qos_update_request(&dev->pm_qos_req, 0);
+			dev_pm_qos_update_request(&dev->pm_qos_req,
+						  PM_QOS_FLAG_NO_POLL);
 		else
 			dev_pm_qos_update_request(&dev->pm_qos_req,
 						  PM_QOS_FLAG_NO_POWER_OFF);
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c
index d4dbe42..a37833f 100644
--- a/drivers/ata/libata-zpodd.c
+++ b/drivers/ata/libata-zpodd.c
@@ -2,6 +2,7 @@
 #include <linux/cdrom.h>
 #include <linux/pm_runtime.h>
 #include <scsi/scsi_device.h>
+#include <linux/pm_qos.h>
 
 #include "libata.h"
 
@@ -215,6 +216,8 @@ void zpodd_post_resume(struct ata_device *dev)
 
 	zpodd->last_ready = 0;
 	zpodd->zp_ready = false;
+
+	dev_pm_qos_update_request(&dev->pm_qos_req, 0);
 }
 
 static void zpodd_wake_dev(acpi_handle handle, u32 event, void *context)