From 46ca29c17e0d752fea641fb6778d3f0f3e5a3842 Mon Sep 17 00:00:00 2001 From: Karen Higgins Date: Sun, 20 Jan 2013 23:50:59 -0500 Subject: [PATCH] --- yaml --- r: 359477 b: refs/heads/master c: ff4108dce9e82acbde8e8b1899aaa4d91bf504b7 h: refs/heads/master i: 359475: b17b2107f71b201172d9cae72179b7aab18cfb26 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_init.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 94d722db1513..4f5f395901d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 026fbd3aaae796d2457898497374b68f3477ee2f +refs/heads/master: ff4108dce9e82acbde8e8b1899aaa4d91bf504b7 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_init.c b/trunk/drivers/scsi/qla4xxx/ql4_init.c index 2045fd79095f..8fc8548ba4ba 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_init.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_init.c @@ -195,12 +195,10 @@ int qla4xxx_get_sys_info(struct scsi_qla_host *ha) * @ha: pointer to host adapter structure. * **/ -static int qla4xxx_init_local_data(struct scsi_qla_host *ha) +static void qla4xxx_init_local_data(struct scsi_qla_host *ha) { /* Initialize aen queue */ ha->aen_q_count = MAX_AEN_ENTRIES; - - return qla4xxx_get_firmware_status(ha); } static uint8_t @@ -951,8 +949,7 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha, int is_reset) if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR) goto exit_init_hba; - if (qla4xxx_init_local_data(ha) == QLA_ERROR) - goto exit_init_hba; + qla4xxx_init_local_data(ha); status = qla4xxx_init_firmware(ha); if (status == QLA_ERROR)