From 420813df59a5d35db374681d63bbed55ed5ed218 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Tue, 12 Dec 2006 11:50:20 -0800 Subject: [PATCH] --- yaml --- r: 44389 b: refs/heads/master c: 0a1336c8c93530b93c8ecd8c9882f5e528673cab h: refs/heads/master i: 44387: 8ee7e03a21445f9db1a7717655bfda3e97ce9cc5 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c6f2a89efc8..c2de1fc63c81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad1f9791e91511fcff21730e55ad8dbc375c79bb +refs/heads/master: 0a1336c8c93530b93c8ecd8c9882f5e528673cab diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c b/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c index 397da3483af1..ae8bf9950c6d 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/trunk/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;