diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-03 08:07:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-03 08:07:10 -0700 |
| commit | 7d6322b4659216fff76619d3b4088eecbdfa46d5 (patch) | |
| tree | 19aa385d903fcc0f2b5d6d978dc83a87c2eca95f /drivers/scsi/scsi_transport_sas.c | |
| parent | d6b9acc0c6c4a7c5d484d15271a5274656d0864f (diff) | |
| parent | 51c928c34fa7cff38df584ad01de988805877dba (diff) | |
| download | linux-7d6322b4659216fff76619d3b4088eecbdfa46d5.tar.gz linux-7d6322b4659216fff76619d3b4088eecbdfa46d5.tar.bz2 linux-7d6322b4659216fff76619d3b4088eecbdfa46d5.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/scsi_transport_sas.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_sas.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index ff724bbe6611..1d145d2f9a38 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c @@ -628,17 +628,16 @@ sas_rphy_delete(struct sas_rphy *rphy) struct Scsi_Host *shost = dev_to_shost(parent->dev.parent); struct sas_host_attrs *sas_host = to_sas_host_attrs(shost); - transport_destroy_device(&rphy->dev); + scsi_remove_target(dev); - scsi_remove_target(&rphy->dev); + transport_remove_device(dev); + device_del(dev); + transport_destroy_device(dev); spin_lock(&sas_host->lock); list_del(&rphy->list); spin_unlock(&sas_host->lock); - transport_remove_device(dev); - device_del(dev); - transport_destroy_device(dev); put_device(&parent->dev); } EXPORT_SYMBOL(sas_rphy_delete); |