From: Russ Dill <Russ.Dill@ti.com>
Date: Thu, 24 Oct 2013 13:25:26 +0000 (+0100)
Subject: PM / hibernate: Move software_resume to late_initcall_sync
X-Git-Tag: MMI-PSA29.97-13-9~13411^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3c345dbc7c083414ef74eb22ff26ba2bd100759;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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: Russ Dill <Russ.Dill@ti.com>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index c9c759d5a15c..0121dab83f43 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -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[] = {