From: Vikas Chaudhary Date: Mon, 16 Dec 2013 11:49:39 +0000 (-0500) Subject: [SCSI] qla4xxx: Return correct error status from func qla4xxx_request_irqs() X-Git-Tag: v3.15-rc1~136^2~84 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bb5649f3eb43f47d07fdfbfbc1ce5b0dd2aef546;p=linux.git [SCSI] qla4xxx: Return correct error status from func qla4xxx_request_irqs() Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c index e56c6b4778cc..49032f640da1 100644 --- 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 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha) 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)