[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 685c350007b0451186ddef6a93121c1098d719cb..f6b1052a3834fe8eee75d5b7380c42b06ab19f4b 100644 (file)
--- 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;
        }