* [PATCH] Fix entering suspend-to-IDLE if no freeze_oops is set
@ 2014-11-08 16:17 Dmitry Eremin-Solenikov
2014-11-08 21:52 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-11-08 16:17 UTC (permalink / raw)
To: linux-kernel; +Cc: Rafael J. Wysocki, Len Brown, Pavel Machek, linux-pm
If no freeze_ops is set, trying to enter suspend-to-IDLE will cause a
nice oops in platform_suspend_prepare_late(). Add respective checks to
platform_suspend_prepare_late() and platform_resume_early() functions.
Fixes: a8d46b9e (ACPI / sleep: Rework the handling of ACPI GPE wakeup ...)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
kernel/power/suspend.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 4ca9a33..c347e3c 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -146,7 +146,7 @@ static int platform_suspend_prepare(suspend_state_t state)
static int platform_suspend_prepare_late(suspend_state_t state)
{
- return state == PM_SUSPEND_FREEZE && freeze_ops->prepare ?
+ return state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->prepare ?
freeze_ops->prepare() : 0;
}
@@ -164,7 +164,7 @@ static void platform_resume_noirq(suspend_state_t state)
static void platform_resume_early(suspend_state_t state)
{
- if (state == PM_SUSPEND_FREEZE && freeze_ops->restore)
+ if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->restore)
freeze_ops->restore();
}
--
2.1.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] Fix entering suspend-to-IDLE if no freeze_oops is set
2014-11-08 16:17 [PATCH] Fix entering suspend-to-IDLE if no freeze_oops is set Dmitry Eremin-Solenikov
@ 2014-11-08 21:52 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2014-11-08 21:52 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov; +Cc: linux-kernel, Len Brown, Pavel Machek, linux-pm
On Saturday, November 08, 2014 07:17:13 PM Dmitry Eremin-Solenikov wrote:
> If no freeze_ops is set, trying to enter suspend-to-IDLE will cause a
> nice oops in platform_suspend_prepare_late(). Add respective checks to
> platform_suspend_prepare_late() and platform_resume_early() functions.
>
> Fixes: a8d46b9e (ACPI / sleep: Rework the handling of ACPI GPE wakeup ...)
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied, thanks!
> ---
> kernel/power/suspend.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index 4ca9a33..c347e3c 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -146,7 +146,7 @@ static int platform_suspend_prepare(suspend_state_t state)
>
> static int platform_suspend_prepare_late(suspend_state_t state)
> {
> - return state == PM_SUSPEND_FREEZE && freeze_ops->prepare ?
> + return state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->prepare ?
> freeze_ops->prepare() : 0;
> }
>
> @@ -164,7 +164,7 @@ static void platform_resume_noirq(suspend_state_t state)
>
> static void platform_resume_early(suspend_state_t state)
> {
> - if (state == PM_SUSPEND_FREEZE && freeze_ops->restore)
> + if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->restore)
> freeze_ops->restore();
> }
>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-08 21:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-08 16:17 [PATCH] Fix entering suspend-to-IDLE if no freeze_oops is set Dmitry Eremin-Solenikov
2014-11-08 21:52 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome