Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / base / power / wakeup.c

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 71c5528e1c357a81112c6f79b1e91f013a58e3aa..8ec406d8f548eae6b84ed692236c12ee45139fa4 100644 (file)
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -542,26 +542,26 @@ static void pm_wakeup_update_hit_counts(void)
 }
 
 /**
- * pm_check_wakeup_events - Check for new wakeup events.
+ * pm_wakeup_pending - Check if power transition in progress should be aborted.
  *
  * Compare the current number of registered wakeup events with its preserved
- * value from the past to check if new wakeup events have been registered since
- * the old value was stored.  Check if the current number of wakeup events being
- * processed is zero.
+ * value from the past and return true if new wakeup events have been registered
+ * since the old value was stored.  Also return true if the current number of
+ * wakeup events being processed is different from zero.
  */
-bool pm_check_wakeup_events(void)
+bool pm_wakeup_pending(void)
 {
        unsigned long flags;
-       bool ret = true;
+       bool ret = false;
 
        spin_lock_irqsave(&events_lock, flags);
        if (events_check_enabled) {
-               ret = ((unsigned int)atomic_read(&event_count) == saved_count)
-                       && !atomic_read(&events_in_progress);
-               events_check_enabled = ret;
+               ret = ((unsigned int)atomic_read(&event_count) != saved_count)
+                       || atomic_read(&events_in_progress);
+               events_check_enabled = !ret;
        }
        spin_unlock_irqrestore(&events_lock, flags);
-       if (!ret)
+       if (ret)
                pm_wakeup_update_hit_counts();
        return ret;
 }