Commit 0e37c275 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 80a1de29 6aa6caff
...@@ -1621,8 +1621,6 @@ void sas_rphy_free(struct sas_rphy *rphy) ...@@ -1621,8 +1621,6 @@ void sas_rphy_free(struct sas_rphy *rphy)
list_del(&rphy->list); list_del(&rphy->list);
mutex_unlock(&sas_host->lock); mutex_unlock(&sas_host->lock);
sas_bsg_remove(shost, rphy);
transport_destroy_device(dev); transport_destroy_device(dev);
put_device(dev); put_device(dev);
...@@ -1681,6 +1679,7 @@ sas_rphy_remove(struct sas_rphy *rphy) ...@@ -1681,6 +1679,7 @@ sas_rphy_remove(struct sas_rphy *rphy)
} }
sas_rphy_unlink(rphy); sas_rphy_unlink(rphy);
sas_bsg_remove(NULL, rphy);
transport_remove_device(dev); transport_remove_device(dev);
device_del(dev); device_del(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment