From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed, 22 Aug 2012 18:21:19 +0000 (-0400)
Subject: [SCSI] qla2xxx: Fail initialization if unable to load RISC code.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c74d88a46865a9c4f14a40ec1ae88e34f38da7a7;p=deliverable%2Flinux.git

[SCSI] qla2xxx: Fail initialization if unable to load RISC code.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9b5e392a1e82..f4bbf1cee6b7 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1561,7 +1561,8 @@ enable_82xx_npiv:
 			    "ISP Firmware failed checksum.\n");
 			goto failed;
 		}
-	}
+	} else
+		goto failed;
 
 	if (!IS_FWI2_CAPABLE(ha) && !IS_QLA2100(ha) && !IS_QLA2200(ha)) {
 		/* Enable proper parity. */