Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 790c7885 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 378eef99

drivers/base/power/wakeup.c

+2 −5
Original line number Diff line number Diff line
@@ -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))