[PATCH 1/9] cciss: Fallback to MSI rather than to INTx if MSI-X failed

[Alexander Gordeev]

Signed-off-by: Alexander Gordeev <agord...@redhat.com>
Cc: Mike Miller <mike.mil...@hp.com>
Cc: iss_storage...@hp.com
Cc: linux-...@vger.kernel.org
---
 drivers/block/cciss.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 036e8ab..fc5b0a4 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4092,13 +4092,14 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
                if (err > 0) {
                        dev_warn(&h->pdev->dev,
                                "only %d MSI-X vectors available\n", err);
-                       goto default_int_mode;
+                       goto single_msi_mode;
                } else {
                        dev_warn(&h->pdev->dev,
                                "MSI-X init failed %d\n", err);
-                       goto default_int_mode;
+                       goto single_msi_mode;
                }
        }
+single_msi_mode:
        if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {
                if (!pci_enable_msi(h->pdev))
                        h->msi_vector = 1;
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/