summaryrefslogtreecommitdiffstats
path: root/meta/packages/linux/linux-openmoko/break_suspend_cycle.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/linux/linux-openmoko/break_suspend_cycle.patch')
-rw-r--r--meta/packages/linux/linux-openmoko/break_suspend_cycle.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-openmoko/break_suspend_cycle.patch b/meta/packages/linux/linux-openmoko/break_suspend_cycle.patch
new file mode 100644
index 0000000000..2a721481d0
--- /dev/null
+++ b/meta/packages/linux/linux-openmoko/break_suspend_cycle.patch
@@ -0,0 +1,34 @@
1Index: linux-2.6.21/drivers/char/apm-emulation.c
2===================================================================
3--- linux-2.6.21.orig/drivers/char/apm-emulation.c 2008-02-21 00:32:41.000000000 +0000
4+++ linux-2.6.21/drivers/char/apm-emulation.c 2008-02-21 00:33:43.000000000 +0000
5@@ -206,10 +206,18 @@
6 return ret;
7 }
8
9+static in_suspend;
10+
11 static void apm_suspend(void)
12 {
13 struct apm_user *as;
14- int err = pm_suspend(PM_SUSPEND_MEM);
15+ int err;
16+
17+ in_suspend = 1;
18+
19+ err = pm_suspend(PM_SUSPEND_MEM);
20+
21+ in_suspend = 0;
22
23 /*
24 * Anyone on the APM queues will think we're still suspended.
25@@ -663,6 +671,9 @@
26 {
27 unsigned long flags;
28
29+ if (in_suspend)
30+ return;
31+
32 spin_lock_irqsave(&kapmd_queue_lock, flags);
33 queue_add_event(&kapmd_queue, event);
34 spin_unlock_irqrestore(&kapmd_queue_lock, flags);