From a757a163ae639e5097ebc8b56f8fe89fec67fefe Mon Sep 17 00:00:00 2001
From: Mike Anderson <andmike@us.ibm.com>
Date: Tue, 14 Mar 2006 11:18:46 -0800
Subject: [PATCH] --- yaml --- r: 22648 b: refs/heads/master c:
 a50a5e3792a6c65f95dab547dba45608bd193404 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/scsi_scan.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 343daedc0302..402e2071fc0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dec70e053613c31e8feab9e14607eaaed99d77c
+refs/heads/master: a50a5e3792a6c65f95dab547dba45608bd193404
diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c
index 9cd4404cf9ab..f14945996ede 100644
--- a/trunk/drivers/scsi/scsi_scan.c
+++ b/trunk/drivers/scsi/scsi_scan.c
@@ -288,10 +288,7 @@ static void scsi_target_dev_release(struct device *dev)
 {
 	struct device *parent = dev->parent;
 	struct scsi_target *starget = to_scsi_target(dev);
-	struct Scsi_Host *shost = dev_to_shost(parent);
 
-	if (shost->hostt->target_destroy)
-		shost->hostt->target_destroy(starget);
 	kfree(starget);
 	put_device(parent);
 }
@@ -416,6 +413,8 @@ static void scsi_target_reap_usercontext(void *data)
 	device_del(&starget->dev);
 	transport_destroy_device(&starget->dev);
 	spin_lock_irqsave(shost->host_lock, flags);
+	if (shost->hostt->target_destroy)
+		shost->hostt->target_destroy(starget);
 	list_del_init(&starget->siblings);
 	spin_unlock_irqrestore(shost->host_lock, flags);
 	put_device(&starget->dev);