Commit:     0a1336c8c93530b93c8ecd8c9882f5e528673cab
Parent:     ad1f9791e91511fcff21730e55ad8dbc375c79bb
Author:     Roland Dreier <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 12 11:50:20 2006 -0800
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Tue Dec 12 11:50:20 2006 -0800

    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
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
 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 
index 397da34..ae8bf99 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to