From 11956b31915637754eecaae0c137d99cfff441ba Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 31 Jan 2011 11:07:01 +0100 Subject: [PATCH] --- yaml --- r: 235139 b: refs/heads/master c: 790c7885a4b2105e41f7a80b035fdb78e406154f h: refs/heads/master i: 235137: 94ac46e095e38d7ed5c768c0b294642b41282cb1 235135: 3b2a09bd3ef21a98f102a41d424b9304b67d810e v: v3 --- [refs] | 2 +- trunk/drivers/base/power/wakeup.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 91b5ac7830dd..7f53152cd660 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 378eef99ad45700aabfba2bd962516e5608b259a +refs/heads/master: 790c7885a4b2105e41f7a80b035fdb78e406154f diff --git a/trunk/drivers/base/power/wakeup.c b/trunk/drivers/base/power/wakeup.c index 07e08c3aece4..82836383997f 100644 --- a/trunk/drivers/base/power/wakeup.c +++ b/trunk/drivers/base/power/wakeup.c @@ -586,17 +586,14 @@ bool pm_wakeup_pending(void) * Store the number of registered wakeup events at the address in @count. Block * if the current number of wakeup events being processed is nonzero. * - * Return false if the wait for the number of wakeup events being processed to + * 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. + * of wakeup events being processed is still nonzero). Otherwise return 'true'. */ bool pm_get_wakeup_count(unsigned int *count) { unsigned int cnt, inpr; - if (capable(CAP_SYS_ADMIN)) - events_check_enabled = false; - for (;;) { split_counters(&cnt, &inpr); if (inpr == 0 || signal_pending(current))