From 90ad07384689ac5ffd52e259e653396552d6523d Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri, 23 Jul 2010 15:28:29 +0500
Subject: [PATCH] --- yaml --- r: 204287 b: refs/heads/master c:
 14e303d98bcfe4a6075407b531b1df2f237deb28 h: refs/heads/master i:   204285:
 95965f061ad4f0c3d4c022de9482118aaee060da   204283:
 3aee2eea301fa075ddaeba6155c3140ba23b63e1   204279:
 5d56023f5cc356b72386c08caef3ed2b63d0048b   204271:
 11bc9e76f6824bdf86056ec00cf2c96bce6df587   204255:
 17969c6526820d57c182a34da33c54e684d66666   204223:
 ec203f4b59f0e532699bb457824f1c9b6b3f4ed6   204159:
 7a82e16735fb2a296453552b62feff5ddd5eb313   204031:
 a58b2f909037dae2cc7a3d6fa3d9307e20360bcf   203775:
 2250b5950b01a05dbf21cc78aa4d615fd1d85066 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_init.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ad22b152809..4bf38c80ffc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c3f563c55121292022a6e8e213ea54c20a5980
+refs/heads/master: 14e303d98bcfe4a6075407b531b1df2f237deb28
diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c
index 685c350007b0..f6b1052a3834 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_init.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_init.c
@@ -1402,9 +1402,10 @@ qla2x00_setup_chip(scsi_qla_host_t *vha)
 
 	if (IS_QLA82XX(ha)) {
 		rval = ha->isp_ops->load_risc(vha, &srisc_address);
-		if (rval == QLA_SUCCESS)
+		if (rval == QLA_SUCCESS) {
+			qla2x00_stop_firmware(vha);
 			goto enable_82xx_npiv;
-		else
+		} else
 			goto failed;
 	}