summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-23 07:53:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-23 07:53:36 +0200
commit63dafeb392139b893a73b6331f347613f0929702 (patch)
tree44f928364b4e48c44b1ffe61d1578535de2a657a /drivers/s390
parentb29929b819f35503024c6a7e6ad442f6e36c68a0 (diff)
parent86731a2a651e58953fc949573895f2fa6d456841 (diff)
downloadlinux-63dafeb392139b893a73b6331f347613f0929702.tar.gz
linux-63dafeb392139b893a73b6331f347613f0929702.tar.bz2
linux-63dafeb392139b893a73b6331f347613f0929702.zip
Merge 6.16-rc3 into driver-core-next
We need the driver-core fixes that are in 6.16-rc3 into here as well to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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;