diff options
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_nx.c')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 449256f2c5f..b311a96acf1 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c | |||
@@ -1540,10 +1540,12 @@ qla4_8xxx_try_start_fw(struct scsi_qla_host *ha) | |||
1540 | ql4_printk(KERN_INFO, ha, | 1540 | ql4_printk(KERN_INFO, ha, |
1541 | "FW: Attempting to load firmware from flash...\n"); | 1541 | "FW: Attempting to load firmware from flash...\n"); |
1542 | rval = qla4_8xxx_start_firmware(ha, ha->hw.flt_region_fw); | 1542 | rval = qla4_8xxx_start_firmware(ha, ha->hw.flt_region_fw); |
1543 | if (rval == QLA_SUCCESS) | ||
1544 | return rval; | ||
1545 | 1543 | ||
1546 | ql4_printk(KERN_ERR, ha, "FW: Load firmware from flash FAILED...\n"); | 1544 | if (rval != QLA_SUCCESS) { |
1545 | ql4_printk(KERN_ERR, ha, "FW: Load firmware from flash" | ||
1546 | " FAILED...\n"); | ||
1547 | return rval; | ||
1548 | } | ||
1547 | 1549 | ||
1548 | return rval; | 1550 | return rval; |
1549 | } | 1551 | } |
@@ -1764,20 +1766,9 @@ int qla4_8xxx_load_risc(struct scsi_qla_host *ha) | |||
1764 | int retval; | 1766 | int retval; |
1765 | retval = qla4_8xxx_device_state_handler(ha); | 1767 | retval = qla4_8xxx_device_state_handler(ha); |
1766 | 1768 | ||
1767 | if (retval == QLA_SUCCESS && | 1769 | if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags)) |
1768 | !test_bit(AF_INIT_DONE, &ha->flags)) { | ||
1769 | retval = qla4xxx_request_irqs(ha); | 1770 | retval = qla4xxx_request_irqs(ha); |
1770 | if (retval != QLA_SUCCESS) { | 1771 | |
1771 | ql4_printk(KERN_WARNING, ha, | ||
1772 | "Failed to reserve interrupt %d already in use.\n", | ||
1773 | ha->pdev->irq); | ||
1774 | } else { | ||
1775 | set_bit(AF_IRQ_ATTACHED, &ha->flags); | ||
1776 | ha->host->irq = ha->pdev->irq; | ||
1777 | ql4_printk(KERN_INFO, ha, "%s: irq %d attached\n", | ||
1778 | __func__, ha->pdev->irq); | ||
1779 | } | ||
1780 | } | ||
1781 | return retval; | 1772 | return retval; |
1782 | } | 1773 | } |
1783 | 1774 | ||