diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
| commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
| tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /drivers/scsi/scsi_scan.c | |
| parent | 376f7839b72ec526173cafb5d8eadfc61e2effdf (diff) | |
| parent | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff) | |
Merge commit 'takashi/topic/asoc' into for-2.6.31
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 | ||