Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309663
b: refs/heads/master
c: 43a8d39
h: refs/heads/master
i:
  309661: 04322fd
  309659: 3d91373
  309655: af8d126
  309647: 09ebd3c
  309631: 2b728b3
v: v3
  • Loading branch information
Dan Williams authored and James Bottomley committed May 30, 2012
1 parent f6086bb commit a9e9a26
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b83d543fd934d565fb243ef348b06a61d794b31d
refs/heads/master: 43a8d39d0137612c336aa8bbb2cb886a79772ffb
7 changes: 5 additions & 2 deletions trunk/drivers/scsi/scsi_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ int scsi_complete_async_scans(void)

do {
if (list_empty(&scanning_hosts))
return 0;
goto out;
/* 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.
Expand Down Expand Up @@ -179,8 +179,11 @@ int scsi_complete_async_scans(void)
}
done:
spin_unlock(&async_scan_lock);

kfree(data);

out:
async_synchronize_full_domain(&scsi_sd_probe_domain);

return 0;
}

Expand Down

0 comments on commit a9e9a26

Please sign in to comment.