Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=820054b7ca7a54ba94d89db4b3c53a24d2d66633
Commit:     820054b7ca7a54ba94d89db4b3c53a24d2d66633
Parent:     569b87b47f906d65ee35d6ecc4767f20a6390b9b
Author:     Bryan O'Sullivan <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 15 14:45:06 2007 -0700
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Wed Apr 18 20:20:58 2007 -0700

    IB/ipath: Print better error messages if kernel is misconfigured
    
    Signed-off-by: Bryan O'Sullivan <[EMAIL PROTECTED]>
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
---
 drivers/infiniband/hw/ipath/ipath_driver.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c 
b/drivers/infiniband/hw/ipath/ipath_driver.c
index ab7458e..056e106 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -390,15 +390,23 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
 
        /* setup the chip-specific functions, as early as possible. */
        switch (ent->device) {
-#ifdef CONFIG_HT_IRQ
        case PCI_DEVICE_ID_INFINIPATH_HT:
+#ifdef CONFIG_HT_IRQ
                ipath_init_iba6110_funcs(dd);
                break;
+#else
+               ipath_dev_err(dd, "QLogic HT device 0x%x cannot work if "
+                             "CONFIG_HT_IRQ is not enabled\n", ent->device);
+               return -ENODEV;
 #endif
-#ifdef CONFIG_PCI_MSI
        case PCI_DEVICE_ID_INFINIPATH_PE800:
+#ifdef CONFIG_PCI_MSI
                ipath_init_iba6120_funcs(dd);
                break;
+#else
+               ipath_dev_err(dd, "QLogic PCIE device 0x%x cannot work if "
+                             "CONFIG_PCI_MSI is not enabled\n", ent->device);
+               return -ENODEV;
 #endif
        default:
                ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to