ATA: logical-bitwise and confusion in ahci_save_initial_config()

PATCH Applied Roel Kluin 3 participants 3 messages Mar 9, 2008 – Mar 11, 2008 libata

lore

Share & tools

lore

Roel Kluin

author

2008-03-09 20:42 UTC #0 lore raw

PATCH 1/1 ATA: logical-bitwise and confusion in ahci_save_initial_config()

logical-bitwise & confusion

Signed-off-by Roel Kluin <[email protected]>

---

drivers/ata/ahci.c +1 -1

index 8a49835..1b73307 100644
@@ -672,7 +672,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;

Tejun Heo

Acked-by on v1 1/1

2008-03-10 11:42 UTC #1 lore raw

Quoted 3 lines · Roel Kluin

logical-bitwise & confusion
Signed-off-by Roel Kluin <[email protected]>

Acked-by Tejun Heo <[email protected]>

Thanks for spotting this.

Signature · 1 line

tejun

Jeff Garzik

Applied

2008-03-11 00:52 UTC #2 lore raw

In reply to Roel Kluin

Quoted 9 lines · Roel Kluin

logical-bitwise & confusion
Signed-off-by Roel Kluin <[email protected]>
---
drivers/ata/ahci.c +0 -0
index 8a49835..1b73307 100644

drivers/ata/ahci.c static void ahci_save_initial_config(struct pci_dev *pdev, · line 678

Quoted 8 lines

drivers/ata/ahci.c +1 -1

@@ -672,7 +672,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;

applied