The patch titled
Subject: rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
has been added to the -mm tree. Its filename is
rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Daniel Glöckner <daniel-gl@xxxxxxx>
Subject: rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
b5ada4600d ("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@xxxxxxx>
Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-cmos.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-cmos.c~rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep
+++ a/drivers/rtc/rtc-cmos.c
@@ -856,7 +856,7 @@ static void __exit cmos_do_remove(struct
cmos->dev = NULL;
}
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
static int cmos_suspend(struct device *dev)
{
@@ -907,6 +907,8 @@ static inline int cmos_poweroff(struct d
return cmos_suspend(dev);
}
+#ifdef CONFIG_PM_SLEEP
+
static int cmos_resume(struct device *dev)
{
struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@ -954,6 +956,7 @@ static int cmos_resume(struct device *de
return 0;
}
+#endif
#else
static inline int cmos_poweroff(struct device *dev)
_
Patches currently in -mm which might be from daniel-gl@xxxxxxx are
rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html