diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-01-30 23:28:16 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-01-30 23:28:16 +0300 |
| commit | a01e0f47a7a10668c178f058bcf136f8ec897286 (patch) | |
| tree | c976a969b7754c2f4b66ce90520c91d8f2df32fb /kernel/power/hibernate.c | |
| parent | 14ee7df1ac5a93019394e17375003e86f45cdcd8 (diff) | |
| parent | 3775fc538f535a7c5adaf11990c7932a0bd1f9eb (diff) | |
| download | linux-a01e0f47a7a10668c178f058bcf136f8ec897286.tar.xz | |
Merge branch 'pm-sleep'
Merge fixes related to system sleep for 6.14-rc1:
- Add missing error handling for syscore_suspend() to the hibernation
core code (Wentao Liang).
- Revert a commit that added unused macros (Andy Shevchenko).
- Synchronize the runtime PM status of devices that were runtime-
suspended before a system-wide suspend and need to be resumed during
the subsequent syste-wide resume transition (Rafael Wysocki).
* pm-sleep:
PM: sleep: core: Synchronize runtime PM status of parents and children
PM: Revert "Add EXPORT macros for exporting PM functions"
PM: hibernate: Add error handling for syscore_suspend()
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 1f87aa01ba44..10a01af63a80 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -608,7 +608,11 @@ int hibernation_platform_enter(void) local_irq_disable(); system_state = SYSTEM_SUSPEND; - syscore_suspend(); + + error = syscore_suspend(); + if (error) + goto Enable_irqs; + if (pm_wakeup_pending()) { error = -EAGAIN; goto Power_up; @@ -620,6 +624,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); + Enable_irqs: system_state = SYSTEM_RUNNING; local_irq_enable(); |