From: Quinn Tran <qutran@marvell.com>
Date: Wed, 12 Feb 2020 21:44:31 +0000 (-0800)
Subject: scsi: qla2xxx: Use correct ISP28xx active FW region
X-Git-Tag: v5.7-rc1~112^2~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d4926d13076a89c1f750fe5af4c082d8ea15008;p=thirdparty%2Flinux.git

scsi: qla2xxx: Use correct ISP28xx active FW region

For ISP28xx, use 28xx call to retrieve active FW region.

Link: https://lore.kernel.org/r/20200212214436.25532-21-hmadhani@marvell.com
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 34fa200900fce..714bcf5e6e53a 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -2415,7 +2415,7 @@ qla2x00_get_flash_image_status(struct bsg_job *bsg_job)
 	regions.global_image = active_regions.global;
 
 	if (IS_QLA28XX(ha)) {
-		qla27xx_get_active_image(vha, &active_regions);
+		qla28xx_get_aux_images(vha, &active_regions);
 		regions.board_config = active_regions.aux.board_config;
 		regions.vpd_nvram = active_regions.aux.vpd_nvram;
 		regions.npiv_config_0_1 = active_regions.aux.npiv_config_0_1;