diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 12:16:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 12:16:01 -0400 |
| commit | 61aa1620be20ddad75dde7882509bfe00148b8aa (patch) | |
| tree | 0ce3d4b71d06c460f8c24347ebd8630a52000ed5 /drivers/s390/scsi/zfcp_sysfs.c | |
| parent | d4f452f8259086028aa17d495deb735e056188f4 (diff) | |
| parent | 9e820afd0c4f3c8e8894aa91f5671fd7d11a787b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] zfcp: Flush SCSI registration work when adding unit
[SCSI] zfcp: Fix timer initialization for ct and els requests
[SCSI] zfcp: Warn about storage devices with broken PLOGI data
[SCSI] zfcp: Handle WWPN mismatch in PLOGI payload
[SCSI] zfcp: fix kfree handling in zfcp_init_device_setup
[SCSI] fix memory leak in initialization
Diffstat (limited to 'drivers/s390/scsi/zfcp_sysfs.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 079a8cf518a3..d31000886ca8 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c | |||
| @@ -224,6 +224,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev, | |||
| 224 | 224 | ||
| 225 | zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL); | 225 | zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL); |
| 226 | zfcp_erp_wait(unit->port->adapter); | 226 | zfcp_erp_wait(unit->port->adapter); |
| 227 | flush_work(&unit->scsi_work); | ||
| 227 | zfcp_unit_put(unit); | 228 | zfcp_unit_put(unit); |
| 228 | out: | 229 | out: |
| 229 | mutex_unlock(&zfcp_data.config_mutex); | 230 | mutex_unlock(&zfcp_data.config_mutex); |