From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 19 Jun 2020 14:30:41 +0000 (+0300)
Subject: scsi: qla2xxx: Fix a condition in qla2x00_find_all_fabric_devs()
X-Git-Tag: v5.8-rc4~6^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fc98aaf7f85fadcca57c4a86ef17e1940cad2d3;p=thirdparty%2Flinux.git

scsi: qla2xxx: Fix a condition in qla2x00_find_all_fabric_devs()

This code doesn't make sense unless the correct "fcport" was found.

Link: https://lore.kernel.org/r/20200619143041.GD267142@mwanda
Fixes: 9dd9686b1419 ("scsi: qla2xxx: Add changes for devloss timeout in driver")
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Shyam Sundar <ssundar@marvell.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 4576d3ae99372..2436a17f5cd91 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5944,7 +5944,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
 			break;
 		}
 
-		if (NVME_TARGET(vha->hw, fcport)) {
+		if (found && NVME_TARGET(vha->hw, fcport)) {
 			if (fcport->disc_state == DSC_DELETE_PEND) {
 				qla2x00_set_fcport_disc_state(fcport, DSC_GNL);
 				vha->fcport_count--;