[SCSI] qla2xxx: Correct MSI-X vector allocation for single queue mode.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 789fc576f222..e28ad81baf1e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1868,6 +1868,7 @@ qla24xx_disable_msix(struct qla_hw_data *ha)
 static int
 qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
 {
+#define MIN_MSIX_COUNT  2
         int i, ret;
         struct msix_entry *entries;
         struct qla_msix_entry *qentry;
@@ -1883,12 +1884,16 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
 
         ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
         if (ret) {
+                if (ret < MIN_MSIX_COUNT)
+                        goto msix_failed;
+
                 qla_printk(KERN_WARNING, ha,
                         "MSI-X: Failed to enable support -- %d/%d\n"
                         " Retry with %d vectors\n", ha->msix_count, ret, ret);
                 ha->msix_count = ret;
                 ret = pci_enable_msix(ha->pdev, entries, ha->msix_count);
                 if (ret) {
+msix_failed:
                         qla_printk(KERN_WARNING, ha, "MSI-X: Failed to enable"
                                 " support, giving up -- %d/%d\n",
                                 ha->msix_count, ret);