]> git.hungrycats.org Git - linux/commit
rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
authorDaniel Glöckner <daniel-gl@gmx.net>
Mon, 13 Oct 2014 22:53:16 +0000 (15:53 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Oct 2014 16:43:15 +0000 (09:43 -0700)
commitdb96c43598d7b77105292d1d6c40d73fdaba0be4
treea2795a5f577d7f8a345b322bea052972d6de7148
parent204530a20b4951e573d9d3952dcd405cd090092c
rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP

commit a882b14fe84951e236cd074e93575adc8a4be32e upstream.

Commit b5ada4600dfd ("drivers/rtc/rtc-cmos.c: fix compilation warning
when !CONFIG_PM_SLEEP") broke wakeup from S5 by making cmos_poweroff a
nop unless CONFIG_PM_SLEEP was defined.

Fix this by restricting the #ifdef to cmos_resume and restoring the old
dependency on CONFIG_PM for cmos_suspend and cmos_poweroff.

Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/rtc/rtc-cmos.c