From efad39f350e721c5080c4dbde71cdc3031d4251c Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Mon, 9 Jul 2012 19:33:45 -0700
Subject: [PATCH] --- yaml --- r: 316847 b: refs/heads/master c:
 e96eb23d82b4246cce4eeb14a7eedbbdcf37b3d4 h: refs/heads/master i:   316845:
 b58e2aa06cf2971e723255bcb96ea883c429d003   316843:
 4719242c34470ecd88f4b8f8d3588fd380fa4fee   316839:
 97f99bab6053a6c1dd1a0e7f24fa2f60cafb7709   316831:
 799d61edb0fd8e408811021403b5b1f2ab2b2849 v: v3

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

diff --git a/[refs] b/[refs]
index e01f7f0f705f..a28ee2907eb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 492d542273a4859f8bf8cc7744cdf71ef50b39ea
+refs/heads/master: e96eb23d82b4246cce4eeb14a7eedbbdcf37b3d4
diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c
index a0bc66372654..56a93794c470 100644
--- a/trunk/drivers/scsi/scsi_scan.c
+++ b/trunk/drivers/scsi/scsi_scan.c
@@ -147,7 +147,7 @@ int scsi_complete_async_scans(void)
 
 	do {
 		if (list_empty(&scanning_hosts))
-			goto out;
+			return 0;
 		/* If we can't get memory immediately, that's OK.  Just
 		 * sleep a little.  Even if we never get memory, the async
 		 * scans will finish eventually.
@@ -179,11 +179,8 @@ int scsi_complete_async_scans(void)
 	}
  done:
 	spin_unlock(&async_scan_lock);
-	kfree(data);
-
- out:
-	async_synchronize_full_domain(&scsi_sd_probe_domain);
 
+	kfree(data);
 	return 0;
 }