Commit 9ddf7f50 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'pm-fixes' of git://

* 'pm-fixes' of git://
  PM: Reintroduce dropped call to check_wakeup_irqs
parents 71a1b44b 88759622
......@@ -9,6 +9,7 @@
#include <linux/syscore_ops.h>
#include <linux/mutex.h>
#include <linux/module.h>
#include <linux/interrupt.h>
static LIST_HEAD(syscore_ops_list);
static DEFINE_MUTEX(syscore_ops_lock);
......@@ -48,6 +49,13 @@ int syscore_suspend(void)
struct syscore_ops *ops;
int ret = 0;
pr_debug("Checking wakeup interrupts\n");
/* Return error code if there are any wakeup interrupts pending. */
ret = check_wakeup_irqs();
if (ret)
return ret;
"Interrupts enabled before system core suspend.\n");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment