From 3afd50e5f3e3fa03efe90291390026bd835ec094 Mon Sep 17 00:00:00 2001 From: Lalit Chandivade Date: Mon, 13 Feb 2012 18:30:41 +0530 Subject: [PATCH] --- yaml --- r: 292961 b: refs/heads/master c: 981c982c2d739940d36ab535047a471943787c93 h: refs/heads/master i: 292959: 76be26cfd8e5168de754327ef8d89965f6d5c45d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_mbx.c | 2 ++ trunk/drivers/scsi/qla4xxx/ql4_os.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6a8e098bde77..13381631e8b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45857216f2a513872efc965f66bca21ace0980fd +refs/heads/master: 981c982c2d739940d36ab535047a471943787c93 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c index e1e66a45e4d0..eaf21852887c 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c @@ -661,6 +661,8 @@ int qla4xxx_get_fwddb_entry(struct scsi_qla_host *ha, } memset(&mbox_cmd, 0, sizeof(mbox_cmd)); memset(&mbox_sts, 0, sizeof(mbox_sts)); + if (fw_ddb_entry) + memset(fw_ddb_entry, 0, sizeof(struct dev_db_entry)); mbox_cmd[0] = MBOX_CMD_GET_DATABASE_ENTRY; mbox_cmd[1] = (uint32_t) fw_ddb_index; diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index c1189e5fab14..089443add47f 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c @@ -4090,6 +4090,10 @@ static void qla4xxx_build_st_list(struct scsi_qla_host *ha, if (ret == QLA_ERROR) break; + /* Ignore DDB if invalid state (unassigned) */ + if (state == DDB_DS_UNASSIGNED) + goto continue_next_st; + /* Check if ST, add to the list_st */ if (strlen((char *) fw_ddb_entry->iscsi_name) != 0) goto continue_next_st;