[SCSI] qla4xxx: Return correct error status from func qla4xxx_request_irqs()

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index e56c6b4778cc42a35a8d7956258e397e5c9798dc..49032f640da1ed1150b5307ce397699a9cedf474 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1488,6 +1488,7 @@ void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen)
 int qla4xxx_request_irqs(struct scsi_qla_host *ha)
 {
        int ret;
+       int rval = QLA_ERROR;
 
        if (is_qla40XX(ha))
                goto try_intx;
@@ -1568,9 +1569,10 @@ irq_attached:
        set_bit(AF_IRQ_ATTACHED, &ha->flags);
        ha->host->irq = ha->pdev->irq;
        ql4_printk(KERN_INFO, ha, "%s: irq %d attached\n",
-           __func__, ha->pdev->irq);
+                  __func__, ha->pdev->irq);
+       rval = QLA_SUCCESS;
 irq_not_attached:
-       return ret;
+       return rval;
 }
 
 void qla4xxx_free_irqs(struct scsi_qla_host *ha)