Skip to content

Commit

Permalink
PM / hibernate: Move software_resume to late_initcall_sync
Browse files Browse the repository at this point in the history
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: Russ Dill <Russ.Dill@ti.com>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Russ Dill authored and Rafael J. Wysocki committed Oct 24, 2013
1 parent 7244cb6 commit d3c345d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/power/hibernate.c
Original file line number Diff line number Diff line change
@@ -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[] = {

0 comments on commit d3c345d

Please sign in to comment.