summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-11-07 21:01:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-11-30 12:24:45 +0000
commitdf58d0359581bbd4ee741406d81e69456c684f9d (patch)
tree3452ee043e7a15c1855703d6e9b2a0e6b49f6113
parentb729c09a452a659cdf4d29d83943aa798c5c4ffc (diff)
downloadop-kernel-dev-df58d0359581bbd4ee741406d81e69456c684f9d.zip
op-kernel-dev-df58d0359581bbd4ee741406d81e69456c684f9d.tar.gz
[ARM] Fix "apm -s" command hang
Fix an apparant hang with the "apm -s" command. We omitted to wake up this process once resume had completed. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/apm.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index bbe98e3..845af0b 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -340,6 +340,7 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
wait_event(apm_suspend_waitqueue,
as->suspend_state == SUSPEND_DONE);
} else {
+ as->suspend_state = SUSPEND_WAIT;
up(&state_lock);
/*
@@ -349,8 +350,14 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
* acknowledged.
*/
err = queue_suspend_event(APM_USER_SUSPEND, as);
- if (err < 0)
+ if (err < 0) {
+ /*
+ * Avoid taking the lock here - this
+ * should be fine.
+ */
+ as->suspend_state = SUSPEND_NONE;
break;
+ }
if (err > 0)
apm_suspend();
OpenPOWER on IntegriCloud