Merge tag 'devicetree-fixes-for-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / kernel / power / suspend.c

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index c6272d4..fa3bf16 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -75,9 +75,11 @@ EXPORT_SYMBOL_GPL(pm_suspend_default_s2idle);
 
 void s2idle_set_ops(const struct platform_s2idle_ops *ops)
 {
-       lock_system_sleep();
+       unsigned int sleep_flags;
+
+       sleep_flags = lock_system_sleep();
        s2idle_ops = ops;
-       unlock_system_sleep();
+       unlock_system_sleep(sleep_flags);
 }
 
 static void s2idle_begin(void)
@@ -203,7 +205,9 @@ __setup("mem_sleep_default=", mem_sleep_default_setup);
  */
 void suspend_set_ops(const struct platform_suspend_ops *ops)
 {
-       lock_system_sleep();
+       unsigned int sleep_flags;
+
+       sleep_flags = lock_system_sleep();
 
        suspend_ops = ops;
 
@@ -219,7 +223,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops)
                        mem_sleep_current = PM_SUSPEND_MEM;
        }
 
-       unlock_system_sleep();
+       unlock_system_sleep(sleep_flags);
 }
 EXPORT_SYMBOL_GPL(suspend_set_ops);