From fd37b166ecc3370c21260e172fbb9bbb4cdaea0d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 21 Feb 2008 00:58:17 +0000
Subject: linux-openmoko: Break immediate suspend on resume cycle

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3839 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../linux/linux-openmoko/break_suspend_cycle.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 meta/packages/linux/linux-openmoko/break_suspend_cycle.patch

(limited to 'meta/packages/linux/linux-openmoko')

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 000000000..2a721481d
--- /dev/null
+++ b/meta/packages/linux/linux-openmoko/break_suspend_cycle.patch
@@ -0,0 +1,34 @@
+Index: linux-2.6.21/drivers/char/apm-emulation.c
+===================================================================
+--- linux-2.6.21.orig/drivers/char/apm-emulation.c	2008-02-21 00:32:41.000000000 +0000
++++ linux-2.6.21/drivers/char/apm-emulation.c	2008-02-21 00:33:43.000000000 +0000
+@@ -206,10 +206,18 @@
+ 	return ret;
+ }
+ 
++static in_suspend;
++
+ static void apm_suspend(void)
+ {
+ 	struct apm_user *as;
+-	int err = pm_suspend(PM_SUSPEND_MEM);
++	int err;
++
++	in_suspend = 1;
++
++	err = pm_suspend(PM_SUSPEND_MEM);
++
++	in_suspend = 0;
+ 
+ 	/*
+ 	 * Anyone on the APM queues will think we're still suspended.
+@@ -663,6 +671,9 @@
+ {
+ 	unsigned long flags;
+ 
++	if (in_suspend)
++		return;
++
+ 	spin_lock_irqsave(&kapmd_queue_lock, flags);
+ 	queue_add_event(&kapmd_queue, event);
+ 	spin_unlock_irqrestore(&kapmd_queue_lock, flags);
-- 
cgit v1.2.3