summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2010-07-23 15:28:29 +0500
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 09:06:11 -0500
commit14e303d98bcfe4a6075407b531b1df2f237deb28 (patch)
treead71e225e6e56823981b1afcad7c8fb637315f56 /drivers/scsi
parent03c3f563c55121292022a6e8e213ea54c20a5980 (diff)
downloadlinux-14e303d98bcfe4a6075407b531b1df2f237deb28.tar.gz
linux-14e303d98bcfe4a6075407b531b1df2f237deb28.tar.xz
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c5
1 files changed, 3 insertions, 2 deletions
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;
}