projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
base
/
syscore.c
diff --git
a/drivers/base/syscore.c
b/drivers/base/syscore.c
index dbb8350ea8dc232d713a10c9a4179e221dbcbb45..8d98a329f6ea63a2daf179bb3f15e5307c6a0d13 100644
(file)
--- a/
drivers/base/syscore.c
+++ b/
drivers/base/syscore.c
@@
-9,7
+9,7
@@
#include <linux/syscore_ops.h>
#include <linux/mutex.h>
#include <linux/module.h>
#include <linux/syscore_ops.h>
#include <linux/mutex.h>
#include <linux/module.h>
-#include <linux/
interrupt
.h>
+#include <linux/
suspend
.h>
#include <trace/events/power.h>
static LIST_HEAD(syscore_ops_list);
#include <trace/events/power.h>
static LIST_HEAD(syscore_ops_list);
@@
-54,9
+54,8
@@
int syscore_suspend(void)
pr_debug("Checking wakeup interrupts\n");
/* Return error code if there are any wakeup interrupts pending. */
pr_debug("Checking wakeup interrupts\n");
/* Return error code if there are any wakeup interrupts pending. */
- ret = check_wakeup_irqs();
- if (ret)
- return ret;
+ if (pm_wakeup_pending())
+ return -EBUSY;
WARN_ONCE(!irqs_disabled(),
"Interrupts enabled before system core suspend.\n");
WARN_ONCE(!irqs_disabled(),
"Interrupts enabled before system core suspend.\n");