Commit d3c345db authored by Russ Dill's avatar Russ Dill Committed by Rafael J. Wysocki

PM / hibernate: Move software_resume to late_initcall_sync

software_resume is being called after deferred_probe_initcall in
drivers base. If the probing of the device that contains the resume
image is deferred, and the system has been instructed to wait for
it to show up, this wait will occur in software_resume. This causes
a deadlock.

Move software_resume into late_initcall_sync so that it happens
after all the other late_initcalls.
Signed-off-by: default avatarRuss Dill <Russ.Dill@ti.com>
Acked-by: default avatarPavel Machek <Pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7244cb62
......@@ -846,7 +846,7 @@ static int software_resume(void)
goto Finish;
}
late_initcall(software_resume);
late_initcall_sync(software_resume);
static const char * const hibernation_modes[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment