Merge branch 'fortglx/3.12/time' into fortglx/3.13/time

Merge in the timekeeping changes that missed 3.12

Signed-off-by: John Stultz <john.stultz@linaro.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 72c5cdbe0791..544be722937c 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -72,6 +72,7 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
         } else
                 err = -EINVAL;
 
+        pm_stay_awake(rtc->dev.parent);
         mutex_unlock(&rtc->ops_lock);
         /* A timer might have just expired */
         schedule_work(&rtc->irqwork);
@@ -113,6 +114,7 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
                 err = -EINVAL;
         }
 
+        pm_stay_awake(rtc->dev.parent);
         mutex_unlock(&rtc->ops_lock);
         /* A timer might have just expired */
         schedule_work(&rtc->irqwork);
@@ -771,9 +773,10 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
                 alarm.time = rtc_ktime_to_tm(timer->node.expires);
                 alarm.enabled = 1;
                 err = __rtc_set_alarm(rtc, &alarm);
-                if (err == -ETIME)
+                if (err == -ETIME) {
+                        pm_stay_awake(rtc->dev.parent);
                         schedule_work(&rtc->irqwork);
-                else if (err) {
+                } else if (err) {
                         timerqueue_del(&rtc->timerqueue, &timer->node);
                         timer->enabled = 0;
                         return err;
@@ -818,8 +821,10 @@ static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer)
                 alarm.time = rtc_ktime_to_tm(next->expires);
                 alarm.enabled = 1;
                 err = __rtc_set_alarm(rtc, &alarm);
-                if (err == -ETIME)
+                if (err == -ETIME) {
+                        pm_stay_awake(rtc->dev.parent);
                         schedule_work(&rtc->irqwork);
+                }
         }
 }
 
@@ -845,7 +850,6 @@ void rtc_timer_do_work(struct work_struct *work)
 
         mutex_lock(&rtc->ops_lock);
 again:
-        pm_relax(rtc->dev.parent);
         __rtc_read_time(rtc, &tm);
         now = rtc_tm_to_ktime(tm);
         while ((next = timerqueue_getnext(&rtc->timerqueue))) {
@@ -880,6 +884,7 @@ again:
         } else
                 rtc_alarm_disable(rtc);
 
+        pm_relax(rtc->dev.parent);
         mutex_unlock(&rtc->ops_lock);
 }