diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-04-25 00:16:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 15:31:30 -0700 |
| commit | 0c8454f56623505a99463405fd7d5664adfbb094 (patch) | |
| tree | 64e594f2846d997213890b59168307d12e676ff0 /arch/arm/mach-integrator | |
| parent | 4b2b0b9753194cad44d7295c32044b89710efd70 (diff) | |
PM/Hibernate: Fix waiting for image device to appear on resume
Commit c751085943362143f84346d274e0011419c84202 ("PM/Hibernate: Wait for
SCSI devices scan to complete during resume") added a call to
scsi_complete_async_scans() to software_resume(), so that it waited for
the SCSI scanning to complete, but the call was added at a wrong place.
Namely, it should have been added after wait_for_device_probe(), which
is called only if the image partition hasn't been specified yet. Also,
it's reasonable to check if the image partition is present and only wait
for the device probing and SCSI scanning to complete if it is not the
case.
Additionally, since noresume is checked right at the beginning of
software_resume() and the function returns immediately if it's set, it
doesn't make sense to check it once again later.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-integrator')
0 files changed, 0 insertions, 0 deletions