diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 11:03:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 11:03:50 -0800 |
| commit | 0f511ea70600efb1e06d7b55e1c51a83aff8713c (patch) | |
| tree | aff23d774e17528c27c57b949c5a60aa5c464dbf /drivers/s390/scsi/zfcp_erp.c | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
| parent | ad58f7dbeb6f5ea82679962f18985f16b660a2d9 (diff) | |
| download | linux-0f511ea70600efb1e06d7b55e1c51a83aff8713c.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] zfcp: fix device registration issues
[SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS
[SCSI] scsi: aha152x pcmcia driver needs spi transport
[SCSI] zfcp: correctly set this_id for hosts
[SCSI] Add Brownie to blacklist
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index e3c4bdd29a60..57cb628a05aa 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -3391,10 +3391,13 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter, && (!atomic_test_mask(ZFCP_STATUS_UNIT_TEMPORARY, &unit->status)) && !unit->device - && port->rport) - scsi_add_device(port->adapter->scsi_host, 0, - port->rport->scsi_target_id, - unit->scsi_lun); + && port->rport) { + atomic_set_mask(ZFCP_STATUS_UNIT_REGISTERED, + &unit->status); + scsi_scan_target(&port->rport->dev, 0, + port->rport->scsi_target_id, + unit->scsi_lun, 0); + } zfcp_unit_put(unit); break; case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED: |