From bb4c231c5be9058d1c8e6b8dd9fa35cc2fd27b46 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 23 Jan 2009 11:31:39 +0900 Subject: [PATCH] --- yaml --- r: 133581 b: refs/heads/master c: a5bfc4714b3f01365aef89a92673f2ceb1ccf246 h: refs/heads/master i: 133579: 0977b78f9cbf6c04c6965d33fda0f5638c844792 v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f327a43f02d0..1e7e8fd13c55 100644 --- 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 index 66e012cd3271..98d7a9fbb7ed 100644 --- 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);