Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359477
b: refs/heads/master
c: ff4108d
h: refs/heads/master
i:
  359475: b17b210
v: v3
  • Loading branch information
Karen Higgins authored and James Bottomley committed Jan 30, 2013
1 parent a69b04f commit 46ca29c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 026fbd3aaae796d2457898497374b68f3477ee2f
refs/heads/master: ff4108dce9e82acbde8e8b1899aaa4d91bf504b7
7 changes: 2 additions & 5 deletions trunk/drivers/scsi/qla4xxx/ql4_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 46ca29c

Please sign in to comment.