diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:13:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:13:50 -0700 |
| commit | 0e37c275426c34712d4661d86c375779f3836a7e (patch) | |
| tree | 02484fd49b5021c84f1711e819057b60e65d707f /drivers/scsi | |
| parent | Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | [SCSI] scsi_transport_sas: move bsg destructor into sas_rphy_remove (diff) | |
| download | linux-dev-0e37c275426c34712d4661d86c375779f3836a7e.tar.xz linux-dev-0e37c275426c34712d4661d86c375779f3836a7e.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull single scsi fix from James Bottomley:
"This is a single fix for a bug exposed by a sysfs change in 3.13 which
now causes libsas to trigger a warn on in device removal"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] scsi_transport_sas: move bsg destructor into sas_rphy_remove
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_transport_sas.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index 1b681427dde0..c341f855fadc 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c @@ -1621,8 +1621,6 @@ void sas_rphy_free(struct sas_rphy *rphy) list_del(&rphy->list); mutex_unlock(&sas_host->lock); - sas_bsg_remove(shost, rphy); - transport_destroy_device(dev); put_device(dev); @@ -1681,6 +1679,7 @@ sas_rphy_remove(struct sas_rphy *rphy) } sas_rphy_unlink(rphy); + sas_bsg_remove(NULL, rphy); transport_remove_device(dev); device_del(dev); } |