summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Dupuis <chad.dupuis@qlogic.com>2013-10-30 08:38:09 +0100
committerJames Bottomley <JBottomley@Parallels.com>2013-12-19 16:38:56 +0100
commit3b6e5b9d5f4001b20b8354190755b0affc2a9130 (patch)
treea236ff6b627c73c2d6144430ecbaf1107af24308
parent[SCSI] qla2xxx: Print proper QLAFX00 product name at probe. (diff)
downloadlinux-3b6e5b9d5f4001b20b8354190755b0affc2a9130.tar.xz
linux-3b6e5b9d5f4001b20b8354190755b0affc2a9130.zip
[SCSI] qla2xxx: Honor execute firmware failures.
If the execute firmware command fails we do not stop the rest of the initialization process which will continue to fail so if we encounter an error simply short circuit the process. Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 03f715e7591e..e7e5f4facf7f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1694,6 +1694,8 @@ enable_82xx_npiv:
if (!fw_major_version && ql2xallocfwdump
&& !(IS_P3P_TYPE(ha)))
qla2x00_alloc_fw_dump(vha);
+ } else {
+ goto failed;
}
} else {
ql_log(ql_log_fatal, vha, 0x00cd,