[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>

diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index bbe98e3b860b67c61aaec01778c19a76e2a56582..845af0bc110832ebe3f9477d4e0a3e5a274a28ee 100644 (file)
--- 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();