---

yaml --- r: 204287 b: refs/heads/master c: 14e303d h: refs/heads/master i: 204285: 95965f0 204283: 3aee2ee 204279: 5d56023 204271: 11bc9e7 204255: 17969c6 204223: ec203f4 204159: 7a82e16 204031: a58b2f9 203775: 2250b59 v: v3
git-mirror · Jul 28, 2010 · 90ad073 · 90ad073
1 parent cc36c0d
commit 90ad073
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 	}