PM / Sleep: Make __pm_stay_awake() delete wakeup source timers
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 17 Feb 2012 22:39:39 +0000 (23:39 +0100)
committerArve Hjønnevåg <arve@android.com>
Sat, 17 Mar 2012 01:10:27 +0000 (18:10 -0700)
commitdd84d8514db926fc84a2332ebf5f254cf46fe740
treea78fac16f048ecbcbf9786c68f357ca3b5eb3463
parent91b83809ffb978a4477c25dbef86a800149f2bd1
PM / Sleep: Make __pm_stay_awake() delete wakeup source timers

If __pm_stay_awake() is called after __pm_wakeup_event() for the same
wakep source object before its timer expires, it won't cancel the
timer, so the wakeup source will be deactivated from the timer
function as scheduled by __pm_wakeup_event().  In that case
__pm_stay_awake() doesn't have any effect beyond incrementing
the wakeup source's event_count field, although it should cancel
the timer and make the wakeup source stay active until __pm_relax()
is called for it.

To fix this problem make __pm_stay_awake() delete the wakeup source's
timer and ensure that it won't be deactivated from the timer funtion
afterwards by clearing its timer_expires field.

Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/base/power/wakeup.c