Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 72273a0e5666..b3c6d957fbd8 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -319,11 +319,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         return sdev;
 
 out_device_destroy:
-        scsi_device_set_state(sdev, SDEV_DEL);
-        transport_destroy_device(&sdev->sdev_gendev);
-        put_device(&sdev->sdev_dev);
-        scsi_free_queue(sdev->request_queue);
-        put_device(&sdev->sdev_gendev);
+        __scsi_remove_device(sdev);
 out:
         if (display_failure_msg)
                 printk(ALLOC_FAILURE_MSG, __func__);