Merge "rtc: Disable alarm irq if alarm time is in the past" (a70fb461) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/rtc/interface.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -394,6 +394,14 @@ int rtc_set_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)
		}
		EXPORT_SYMBOL_GPL(rtc_set_alarm);

		static void rtc_alarm_disable(struct rtc_device *rtc)
		{
		if (!rtc->ops \|\| !rtc->ops->alarm_irq_enable)
		return;

		rtc->ops->alarm_irq_enable(rtc->dev.parent, false);
		}

		/* Called once per device from rtc_device_register */
		int rtc_initialize_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)
		{
		@@ -421,7 +429,11 @@ int rtc_initialize_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)

		rtc->aie_timer.enabled = 1;
		timerqueue_add(&rtc->timerqueue, &rtc->aie_timer.node);
		} else if (alarm->enabled && (rtc_tm_to_ktime(now).tv64 >=
		rtc->aie_timer.node.expires.tv64)){
		rtc_alarm_disable(rtc);
		}

		mutex_unlock(&rtc->ops_lock);
		return err;
		}
		@@ -800,14 +812,6 @@ static int rtc_timer_enqueue(struct rtc_device rtc, struct rtc_timer timer)
		return 0;
		}

		static void rtc_alarm_disable(struct rtc_device *rtc)
		{
		if (!rtc->ops \|\| !rtc->ops->alarm_irq_enable)
		return;

		rtc->ops->alarm_irq_enable(rtc->dev.parent, false);
		}

		/**
		* rtc_timer_remove - Removes a rtc_timer from the rtc_device timerqueue
		* @rtc rtc device