Commit e56dbc2b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] add back the missing ->slave_destroy call

Looks like the merge error still isn't fixed..
parent 9483711b
...@@ -410,6 +410,8 @@ void scsi_remove_device(struct scsi_device *sdev) ...@@ -410,6 +410,8 @@ void scsi_remove_device(struct scsi_device *sdev)
if (class) { if (class) {
down_write(&class->subsys.rwsem); down_write(&class->subsys.rwsem);
set_bit(SDEV_DEL, &sdev->sdev_state); set_bit(SDEV_DEL, &sdev->sdev_state);
if (sdev->host->hostt->slave_destroy)
sdev->host->hostt->slave_destroy(sdev);
if (atomic_read(&sdev->access_count)) if (atomic_read(&sdev->access_count))
device_del(&sdev->sdev_gendev); device_del(&sdev->sdev_gendev);
up_write(&class->subsys.rwsem); up_write(&class->subsys.rwsem);
......
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