summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-01-31 11:07:01 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-15 00:43:14 +0100
commit790c7885a4b2105e41f7a80b035fdb78e406154f (patch)
treedd0e725335ffe47ebd940f04cbd44db88a39759d /drivers/base
parent378eef99ad45700aabfba2bd962516e5608b259a (diff)
downloadlinux-790c7885a4b2105e41f7a80b035fdb78e406154f.tar.bz2
PM / Wakeup: Don't update events_check_enabled in pm_get_wakeup_count()
Since pm_save_wakeup_count() has just been changed to clear events_check_enabled unconditionally before checking if there are any new wakeup events registered since the last read from /sys/power/wakeup_count, the detection of wakeup events during suspend may be disabled, after it's been enabled, by writing a "wrong" value back to /sys/power/wakeup_count. For this reason, it is not necessary to update events_check_enabled in pm_get_wakeup_count() any more. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/wakeup.c7
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)
* 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))