From: Roel Kluin <12o3l@tiscali.nl>
Date: Sun, 9 Mar 2008 20:42:40 +0000 (+0100)
Subject: ahci: logical-bitwise and confusion in ahci_save_initial_config()
X-Git-Tag: v2.6.25-rc6~44^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=258cd8464b618d5ec3b836f02cce05e3faf226b4;p=linux-2.6

ahci: logical-bitwise and confusion in ahci_save_initial_config()

logical-bitwise & confusion

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 1d60ef0215..6978469eb1 100644
--- a/drivers/ata/ahci.c
+++ b/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;