diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-23 13:31:12 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-23 13:31:12 +0530 |
| commit | 5f47ab52dde52413bbc384ffbe281e371e8c083c (patch) | |
| tree | 114e2bab8b3805134e557582ea6017be245ee7f1 /kernel | |
| parent | 3823a97277d7aee1aab206ff39094c77fd344e4e (diff) | |
Revert "PM: Abort suspend if wake_lock is acquired"
This reverts commit d97f537d271166209261ff364b64b35f0ca98ced.
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/earlysuspend.c | 13 | ||||
| -rw-r--r-- | kernel/power/power.h | 1 | ||||
| -rw-r--r-- | kernel/power/userwakelock.c | 5 |
3 files changed, 0 insertions, 19 deletions
diff --git a/kernel/power/earlysuspend.c b/kernel/power/earlysuspend.c index 6a83e561a480..c165b33d1d31 100644 --- a/kernel/power/earlysuspend.c +++ b/kernel/power/earlysuspend.c @@ -78,10 +78,6 @@ static void suspend(struct work_struct *work) { if (debug_mask & DEBUG_SUSPEND) pr_info("early_suspend: suspend\n"); - - if (pm_wakeup_pending()) - return; - pm_suspend(requested_suspend_state); /* @@ -199,15 +195,6 @@ void request_suspend_state(suspend_state_t new_state) spin_unlock_irqrestore(&state_lock, irqflags); } -void schedule_suspend_work(void) -{ - unsigned long irqflags; - spin_lock_irqsave(&state_lock, irqflags); - if (state & SUSPEND_REQUESTED_AND_SUSPENDED) - queue_delayed_work(suspend_work_queue, &suspend_work, HZ); - spin_unlock_irqrestore(&state_lock, irqflags); -} - suspend_state_t get_suspend_state(void) { return requested_suspend_state; diff --git a/kernel/power/power.h b/kernel/power/power.h index fa264a2933fb..39444230208a 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -289,5 +289,4 @@ ssize_t wake_unlock_store(struct kobject *kobj, struct kobj_attribute *attr, /* kernel/power/earlysuspend.c */ void request_suspend_state(suspend_state_t state); suspend_state_t get_suspend_state(void); -void schedule_suspend_work(void); #endif diff --git a/kernel/power/userwakelock.c b/kernel/power/userwakelock.c index e88c5da53812..a28a8db41468 100644 --- a/kernel/power/userwakelock.c +++ b/kernel/power/userwakelock.c @@ -212,13 +212,8 @@ ssize_t wake_unlock_store( pr_info("wake_unlock_store: %s\n", l->name); wake_unlock(&l->wake_lock); - not_found: mutex_unlock(&tree_lock); - - if (!pm_wakeup_pending()) - schedule_suspend_work(); - return n; } |