[SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.

The driver keeps a copy of the fw_version within the ha structure.
For ISP82xx, this local copy doesn't get updated, and as a result,
the old firmware version ends up getting displayed. This patch fixes
this issue.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <jbottomley@parallels.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 24d2d195d3c6cc0a92fe30dd385bccd0e557d606..cb6969320b47a5ba014cf382a7d75351dc9ea8ab 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5435,6 +5435,13 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)
                ha->isp_abort_cnt = 0;
                clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
 
+               /* Update the firmware version */
+               qla2x00_get_fw_version(vha, &ha->fw_major_version,
+                   &ha->fw_minor_version, &ha->fw_subminor_version,
+                   &ha->fw_attributes, &ha->fw_memory_size,
+                   ha->mpi_version, &ha->mpi_capabilities,
+                   ha->phy_version);
+
                if (ha->fce) {
                        ha->flags.fce_enabled = 1;
                        memset(ha->fce, 0,