diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:50:02 -0400 |
| commit | 7a309490da98981558a07183786201f02a6341e2 (patch) | |
| tree | 204bfd3bc344dbb02be0b1eac29b956f6722e661 /drivers/scsi/scsi_scan.c | |
| parent | 9a8709d44139748fe2e0ab56d20d8c384c8b65ad (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index a14d245a66b8..6f51ca485f35 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -180,8 +180,6 @@ int scsi_complete_async_scans(void) | |||
| 180 | spin_unlock(&async_scan_lock); | 180 | spin_unlock(&async_scan_lock); |
| 181 | 181 | ||
| 182 | kfree(data); | 182 | kfree(data); |
| 183 | /* Synchronize async operations globally */ | ||
| 184 | async_synchronize_full(); | ||
| 185 | return 0; | 183 | return 0; |
| 186 | } | 184 | } |
| 187 | 185 | ||