]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[SCSI] qla2xxx: Honor execute firmware failures.
authorChad Dupuis <chad.dupuis@qlogic.com>
Wed, 30 Oct 2013 07:38:09 +0000 (03:38 -0400)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 19 Dec 2013 15:38:56 +0000 (07:38 -0800)
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>
drivers/scsi/qla2xxx/qla_init.c

index 03f715e7591e75409a04c2a31d3bb015105d0bd1..e7e5f4facf7f3c9850764b34aa5f0ac067d63351 100644 (file)
@@ -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,