From 9f73443f1774f9858975453764fe2ea8589414b4 Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Wed, 28 Dec 2011 18:49:12 +0100 Subject: [PATCH] rtc: Fix unexpected poweron and unnecessary alarm disabling On my laptop with 3.2.0-rc7 I have unexpected poweron after shutdown 300 seconds later. I found out that the "hwclock --systohw" plays with UIE which lead to the rtc_disable_rtc() function call. This function disables the alarm by setting the alarm 300 seconds later with the disable flag which does not seems to be the best way since we could use the alarm_irq_enable handler. Moreover, the rtc_timer_do_work calls the rtc_alarm_disable event if there is no alarm to disable. Therefore, during the boot time, a disabled alarm is set 300 seconds in the future which does not make sense. Signed-off-by: Jeremy Compostella --- drivers/rtc/interface.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 3bcc7cf..9299415 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -778,16 +778,8 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) static void rtc_alarm_disable(struct rtc_device *rtc) { - struct rtc_wkalrm alarm; - struct rtc_time tm; - - __rtc_read_time(rtc, &tm); - - alarm.time = rtc_ktime_to_tm(ktime_add(rtc_tm_to_ktime(tm), - ktime_set(300, 0))); - alarm.enabled = 0; - - ___rtc_set_alarm(rtc, &alarm); + if (rtc->ops && rtc->ops->alarm_irq_enable) + rtc->ops->alarm_irq_enable(rtc->dev.parent, false); } /** @@ -835,7 +827,7 @@ static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer) */ void rtc_timer_do_work(struct work_struct *work) { - struct rtc_timer *timer; + struct rtc_timer *timer = NULL; struct timerqueue_node *next; ktime_t now; struct rtc_time tm; @@ -876,7 +868,7 @@ again: err = __rtc_set_alarm(rtc, &alarm); if (err == -ETIME) goto again; - } else + } else if (timer && timer->enabled == 0) rtc_alarm_disable(rtc); mutex_unlock(&rtc->ops_lock); -- 1.7.2.5