diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
tree | c7839809e35fce4868910742157e8ef96782b378 /kernel/power/hibernate.c | |
parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r-- | kernel/power/hibernate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index c8c272df7154..97522630b1b6 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -129,7 +129,7 @@ static int hibernation_test(int level) { return 0; } | |||
129 | static int platform_begin(int platform_mode) | 129 | static int platform_begin(int platform_mode) |
130 | { | 130 | { |
131 | return (platform_mode && hibernation_ops) ? | 131 | return (platform_mode && hibernation_ops) ? |
132 | hibernation_ops->begin() : 0; | 132 | hibernation_ops->begin(PMSG_FREEZE) : 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | /** | 135 | /** |
@@ -542,7 +542,7 @@ int hibernation_platform_enter(void) | |||
542 | * hibernation_ops->finish() before saving the image, so we should let | 542 | * hibernation_ops->finish() before saving the image, so we should let |
543 | * the firmware know that we're going to enter the sleep state after all | 543 | * the firmware know that we're going to enter the sleep state after all |
544 | */ | 544 | */ |
545 | error = hibernation_ops->begin(); | 545 | error = hibernation_ops->begin(PMSG_HIBERNATE); |
546 | if (error) | 546 | if (error) |
547 | goto Close; | 547 | goto Close; |
548 | 548 | ||