diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/wakeup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 07e08c3aece4..82836383997f 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c | |||
@@ -586,17 +586,14 @@ bool pm_wakeup_pending(void) | |||
586 | * Store the number of registered wakeup events at the address in @count. Block | 586 | * Store the number of registered wakeup events at the address in @count. Block |
587 | * if the current number of wakeup events being processed is nonzero. | 587 | * if the current number of wakeup events being processed is nonzero. |
588 | * | 588 | * |
589 | * Return false if the wait for the number of wakeup events being processed to | 589 | * Return 'false' if the wait for the number of wakeup events being processed to |
590 | * drop down to zero has been interrupted by a signal (and the current number | 590 | * drop down to zero has been interrupted by a signal (and the current number |
591 | * of wakeup events being processed is still nonzero). Otherwise return true. | 591 | * of wakeup events being processed is still nonzero). Otherwise return 'true'. |
592 | */ | 592 | */ |
593 | bool pm_get_wakeup_count(unsigned int *count) | 593 | bool pm_get_wakeup_count(unsigned int *count) |
594 | { | 594 | { |
595 | unsigned int cnt, inpr; | 595 | unsigned int cnt, inpr; |
596 | 596 | ||
597 | if (capable(CAP_SYS_ADMIN)) | ||
598 | events_check_enabled = false; | ||
599 | |||
600 | for (;;) { | 597 | for (;;) { |
601 | split_counters(&cnt, &inpr); | 598 | split_counters(&cnt, &inpr); |
602 | if (inpr == 0 || signal_pending(current)) | 599 | if (inpr == 0 || signal_pending(current)) |