summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2023-07-11 12:15:15 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2023-07-11 12:15:15 -0400
commite96277a570cda96f1363a051b6a1a321f2ec2d35 (patch)
tree324e75dd9ac42ccadb409dfa9ae0268646dc5e05 /drivers/scsi/lpfc
parent06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 (diff)
parenta97ccaa4f04396c594c25877fd2b78cc5baea4ed (diff)
downloadlinux-e96277a570cda96f1363a051b6a1a321f2ec2d35.tar.gz
linux-e96277a570cda96f1363a051b6a1a321f2ec2d35.tar.bz2
linux-e96277a570cda96f1363a051b6a1a321f2ec2d35.zip
Merge branch '6.5/scsi-staging' into 6.5/scsi-fixes
Pull in the currently staged SCSI fixes for 6.5. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 499849b58ee4..fdd7f69d87ef 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -6944,7 +6944,9 @@ lpfc_unregister_fcf_rescan(struct lpfc_hba *phba)
if (rc)
return;
/* Reset HBA FCF states after successful unregister FCF */
+ spin_lock_irq(&phba->hbalock);
phba->fcf.fcf_flag = 0;
+ spin_unlock_irq(&phba->hbalock);
phba->fcf.current_rec.flag = 0;
/*