1 files changed, 19 insertions, 15 deletions

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 1132799421cd..cf1706df7610 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -660,29 +660,33 @@ bool pm_wakeup_pending(void)
 /**
  * pm_get_wakeup_count - Read the number of registered wakeup events.
  * @count: Address to store the value at.
+ * @block: Whether or not to block.
  *
- * Store the number of registered wakeup events at the address in @count.  Block
- * if the current number of wakeup events being processed is nonzero.
+ * Store the number of registered wakeup events at the address in @count.  If
+ * @block is set, block until the current number of wakeup events being
+ * processed is zero.
  *
- * Return 'false' if the wait for the number of wakeup events being processed to
- * drop down to zero has been interrupted by a signal (and the current number
- * of wakeup events being processed is still nonzero).  Otherwise return 'true'.
+ * Return 'false' if the current number of wakeup events being processed is
+ * nonzero.  Otherwise return 'true'.
  */
-bool pm_get_wakeup_count(unsigned int *count)
+bool pm_get_wakeup_count(unsigned int *count, bool block)
 {
         unsigned int cnt, inpr;
-        DEFINE_WAIT(wait);
 
-        for (;;) {
-                prepare_to_wait(&wakeup_count_wait_queue, &wait,
-                                TASK_INTERRUPTIBLE);
-                split_counters(&cnt, &inpr);
-                if (inpr == 0 || signal_pending(current))
-                        break;
+        if (block) {
+                DEFINE_WAIT(wait);
+
+                for (;;) {
+                        prepare_to_wait(&wakeup_count_wait_queue, &wait,
+                                        TASK_INTERRUPTIBLE);
+                        split_counters(&cnt, &inpr);
+                        if (inpr == 0 || signal_pending(current))
+                                break;
 
-                schedule();
+                        schedule();
+                }
+                finish_wait(&wakeup_count_wait_queue, &wait);
         }
-        finish_wait(&wakeup_count_wait_queue, &wait);
 
         split_counters(&cnt, &inpr);
         *count = cnt;