]> git.baikalelectronics.ru Git - kernel.git/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)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:18:19 +0000 (02:18 +0200)
commitcb617129ccfb06bfdd0ad801f2fd0c261c5c16a8
tree66d52ce2c8ce9eeb9b8b2f6bc38c26ff8fa7895d
parent065b630c914d317fa4a46850a97332a6982a6086
rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP

Commit ada57651c636 ("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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-cmos.c