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.
Unified · Split
| @@ -846,7 +846,7 @@ static int software_resume(void) · 845 unmodified lines | |||
| 846 | goto Finish; | 846 | goto Finish; |
| 847 | } | 847 | } |
| 848 | 848 | ||
| 849 | late_initcall(software_resume); | 849 | late_initcall_sync(software_resume); |
| 850 | 850 | ||
| 851 | 851 | ||
| 852 | static const char * const hibernation_modes[] = { | 852 | static const char * const hibernation_modes[] = { |