Commit 0e37c275 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
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
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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);
}