---

yaml --- r: 316847 b: refs/heads/master c: e96eb23 h: refs/heads/master i: 316845: b58e2aa 316843: 4719242 316839: 97f99ba 316831: 799d61e v: v3
git-mirror · Jul 20, 2012 · efad39f · efad39f
1 parent bdf7da4
commit efad39f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;
 }