diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 03:31:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 03:31:22 -0400 |
| commit | d95300758bed9e0f783f3e3b4fd037bf0a21abe0 (patch) | |
| tree | 994823b6e0b88597eded79f9eeb0f44b580c89e5 /drivers/scsi/scsi_transport_sas.c | |
| parent | e12669e774be403c84baa651306d305752a35cd8 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
Merge branch 'master'
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 ff724bbe661..1d145d2f9a3 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); |