diff --git a/[refs] b/[refs]
index b7c865e9cbe2..1e02d396fcb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7afb42226a8eaa9ae3f6b9917ffb16902358e749
+refs/heads/master: 258cd8464b618d5ec3b836f02cce05e3faf226b4
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index 1d60ef02151a..6978469eb16d 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -684,7 +684,7 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
 		cap &= ~HOST_CAP_NCQ;
 	}
 
-	if ((cap && HOST_CAP_PMP) && (hpriv->flags & AHCI_HFLAG_NO_PMP)) {
+	if ((cap & HOST_CAP_PMP) && (hpriv->flags & AHCI_HFLAG_NO_PMP)) {
 		dev_printk(KERN_INFO, &pdev->dev,
 			   "controller can't do PMP, turning off CAP_PMP\n");
 		cap &= ~HOST_CAP_PMP;