summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2025-06-09 15:34:06 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2025-06-09 15:34:06 -0400
commita3da9388c66782dbd808a63709e376ebe81ccca5 (patch)
treec33241e5979b8e2239d55b358666c57ec1d28d4f /drivers/s390
parent19272b37aa4f83ca52bdf9c16d5d81bdd1354494 (diff)
parent9697ca0d53e3db357be26d2414276143c4a2cd49 (diff)
downloadlinux-a3da9388c66782dbd808a63709e376ebe81ccca5.tar.gz
linux-a3da9388c66782dbd808a63709e376ebe81ccca5.tar.bz2
linux-a3da9388c66782dbd808a63709e376ebe81ccca5.zip
Merge branch '6.16/scsi-queue' into 6.16/scsi-fixes
Pull in remaining fixes from queue branch. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 41e36af35488..90a84ae98b97 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -449,6 +449,8 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
return -EINVAL;
+ flush_work(&port->rport_work);
+
retval = zfcp_unit_add(port, fcp_lun);
if (retval)
return retval;