aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 2045fd79095f..8fc8548ba4ba 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -195,12 +195,10 @@ exit_get_sys_info_no_free:
195 * @ha: pointer to host adapter structure. 195 * @ha: pointer to host adapter structure.
196 * 196 *
197 **/ 197 **/
198static int qla4xxx_init_local_data(struct scsi_qla_host *ha) 198static void qla4xxx_init_local_data(struct scsi_qla_host *ha)
199{ 199{
200 /* Initialize aen queue */ 200 /* Initialize aen queue */
201 ha->aen_q_count = MAX_AEN_ENTRIES; 201 ha->aen_q_count = MAX_AEN_ENTRIES;
202
203 return qla4xxx_get_firmware_status(ha);
204} 202}
205 203
206static uint8_t 204static uint8_t
@@ -951,8 +949,7 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha, int is_reset)
951 if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR) 949 if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR)
952 goto exit_init_hba; 950 goto exit_init_hba;
953 951
954 if (qla4xxx_init_local_data(ha) == QLA_ERROR) 952 qla4xxx_init_local_data(ha);
955 goto exit_init_hba;
956 953
957 status = qla4xxx_init_firmware(ha); 954 status = qla4xxx_init_firmware(ha);
958 if (status == QLA_ERROR) 955 if (status == QLA_ERROR)