2008-03-09 20:42:54

by Roel Kluin

Subject: [PATCH] ATA: logical-bitwise and confusion in ahci_save_initial_config()

logical-bitwise & confusion

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 8a49835..1b73307 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -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;

2008-03-10 11:42:38

by Tejun Heo

Subject: Re: [PATCH] ATA: logical-bitwise and confusion in ahci_save_initial_config()

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

Acked-by: Tejun Heo <[email protected]>

Thanks for spotting this.

--
tejun

2008-03-11 00:52:38

by Jeff Garzik

Subject: Re: [PATCH] ATA: logical-bitwise and confusion in ahci_save_initial_config()

Roel Kluin wrote:
> logical-bitwise & confusion
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 8a49835..1b73307 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -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