---

yaml --- r: 133581 b: refs/heads/master c: a5bfc47 h: refs/heads/master i: 133579: 0977b78 v: v3
git-mirror · Mar 25, 2009 · bb4c231 · bb4c231
1 parent c80e315
commit bb4c231
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6be976e79db3ba691b657476a8bf4a635e5586f9
+refs/heads/master: a5bfc4714b3f01365aef89a92673f2ceb1ccf246
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
@@ -2647,8 +2647,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (board_id == board_ahci_sb700 && pdev->revision >= 0x40)
 		hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL;
 
-	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
-		pci_intx(pdev, 1);
+	if (!(hpriv->flags & AHCI_HFLAG_NO_MSI))
+		pci_enable_msi(pdev);
 
 	/* save initial config */
 	ahci_save_initial_config(pdev, hpriv);