aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-09-16 11:34:39 -0400
committerJeff Garzik <jgarzik@redhat.com>2009-09-17 16:45:38 -0400
commit31b239ad1ba7225435e13f5afc47e48eb674c0cc (patch)
treea12ebf643fb9e0ef73832401bc39a8a28ceeb693 /drivers
parentde55a8958f6e3ef5ce5f0971b80bd44bfcac7cf1 (diff)
ahci: restore pci_intx() handling
Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit pci_intx() manipulation from ahci because it seemed unnecessary and ahci doesn't seem to be the right place to be tweaking it if it were. This was largely okay but there are exceptions. There was one on an embedded platform which was fixed via firmware and now bko#14124 reports it on a HP DL320. http://bugzilla.kernel.org/show_bug.cgi?id=14124 I still think this isn't something libata drivers should be caring about (the only ones which are calling pci_intx() explicitly are libata ones and one other driver) but for now reverting the change seems to be the right thing to do. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/ahci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index d4cd9c203314..acd1162712b1 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2930,8 +2930,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2930 if (ahci_sb600_32bit_only(pdev)) 2930 if (ahci_sb600_32bit_only(pdev))
2931 hpriv->flags |= AHCI_HFLAG_32BIT_ONLY; 2931 hpriv->flags |= AHCI_HFLAG_32BIT_ONLY;
2932 2932
2933 if (!(hpriv->flags & AHCI_HFLAG_NO_MSI)) 2933 if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
2934 pci_enable_msi(pdev); 2934 pci_intx(pdev, 1);
2935 2935
2936 /* save initial config */ 2936 /* save initial config */
2937 ahci_save_initial_config(pdev, hpriv); 2937 ahci_save_initial_config(pdev, hpriv);