PM / wakeup: Rework wakeup source timer cancellation
authorViresh Kumar <viresh.kumar@linaro.org>
Fri, 8 Mar 2019 09:53:11 +0000 (15:23 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Mar 2019 08:40:48 +0000 (09:40 +0100)
commit1fad17fb1bbcd73159c2b992668a6957ecc5af8a
tree9d1a61b0ac467950e8f6d7c4205de35bda10fe96
parentef8006846a3a97d9d8bf49e63dba948d0d2dbbf0
PM / wakeup: Rework wakeup source timer cancellation

If wakeup_source_add() is called right after wakeup_source_remove()
for the same wakeup source, timer_setup() may be called for a
potentially scheduled timer which is incorrect.

To avoid that, move the wakeup source timer cancellation from
wakeup_source_drop() to wakeup_source_remove().

Moreover, make wakeup_source_remove() clear the timer function after
canceling the timer to let wakeup_source_not_registered() treat
unregistered wakeup sources in the same way as the ones that have
never been registered.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: 4.4+ <stable@vger.kernel.org> # 4.4+
[ rjw: Subject, changelog, merged two patches together ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/base/power/wakeup.c