diff options
| author | Roland Dreier <rolandd@cisco.com> | 2006-12-12 11:50:20 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-12-12 11:50:20 -0800 |
| commit | 0a1336c8c93530b93c8ecd8c9882f5e528673cab (patch) | |
| tree | 19834d4aeab09b42138db983c1f8e4a55e76ffe0 /drivers/infiniband/hw | |
| parent | ad1f9791e91511fcff21730e55ad8dbc375c79bb (diff) | |
| download | blackbird-op-linux-0a1336c8c93530b93c8ecd8c9882f5e528673cab.tar.gz blackbird-op-linux-0a1336c8c93530b93c8ecd8c9882f5e528673cab.zip | |
IB/ipath: Fix IRQ for PCI Express HCAs
Commit 51f65ebc ("IB/ipath - program intconfig register using new HT
irq hook"), which fixed interrupts for HyperTransport HCAs, broke PCI
Express HCAs, because for those HCAs, the driver uses the value of
pdev->irq before pci_enable_msi() and ends up getting a totally bogus
IRQ number. Fix this by using the value of pdev->irq after
pci_enable_msi().
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c index 397da3483af1..ae8bf9950c6d 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c @@ -851,12 +851,12 @@ static int ipath_setup_pe_config(struct ipath_devdata *dd, int pos, ret; dd->ipath_msi_lo = 0; /* used as a flag during reset processing */ - dd->ipath_irq = pdev->irq; ret = pci_enable_msi(dd->pcidev); if (ret) ipath_dev_err(dd, "pci_enable_msi failed: %d, " "interrupts may not work\n", ret); /* continue even if it fails, we may still be OK... */ + dd->ipath_irq = pdev->irq; if ((pos = pci_find_capability(dd->pcidev, PCI_CAP_ID_MSI))) { u16 control; |
