scsi: qla2xxx: Fix a condition in qla2x00_find_all_fabric_devs()

Dan Carpenter · martinkpetersen · commit 1fc98aaf7f85 · 2020-06-26T22:08:30.000-04:00
This code doesn't make sense unless the correct "fcport" was found. Link: https://lore.kernel.org/r/20200619143041.GD267142@mwanda Fixes: 9dd9686 ("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
@@ -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--;

Original file line number	Diff line number	Diff line change
`@@ -5944,7 +5944,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)`
`5944`	`5944`	`break;`
`5945`	`5945`	`}`
`5946`	`5946`
`5947`		`- if (NVME_TARGET(vha->hw, fcport)) {`
	`5947`	`+ if (found && NVME_TARGET(vha->hw, fcport)) {`
`5948`	`5948`	`if (fcport->disc_state == DSC_DELETE_PEND) {`
`5949`	`5949`	`qla2x00_set_fcport_disc_state(fcport, DSC_GNL);`
`5950`	`5950`	`vha->fcport_count--;`