From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri, 23 Jul 2010 10:28:29 +0000 (+0500)
Subject: [SCSI] qla2xxx: Stop firmware before doing init firmware.
X-Git-Tag: Ubuntu-5.2.0-15.16~24358^2~35
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=14e303d98bcfe4a6075407b531b1df2f237deb28;p=mirror_ubuntu-eoan-kernel.git

[SCSI] qla2xxx: Stop firmware before doing init firmware.

If BIOS is enabled then drivers init firmware fails since
BIOS has done the init once.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 685c350007b0..f6b1052a3834 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/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;
 	}