summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@ti.com>2013-10-24 14:25:26 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-25 01:58:49 +0200
commitd3c345dbc7c083414ef74eb22ff26ba2bd100759 (patch)
tree2019ec28ac1b3284a34d9d8ecea05498e8c1eb10 /kernel
parent7244cb62d96e735847dc9d08f870550df896898c (diff)
downloadblackbird-op-linux-d3c345dbc7c083414ef74eb22ff26ba2bd100759.tar.gz
blackbird-op-linux-d3c345dbc7c083414ef74eb22ff26ba2bd100759.zip
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/hibernate.c2
1 files changed, 1 insertions, 1 deletions
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[] = {
OpenPOWER on IntegriCloud