aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/menelaus.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index a4a8f1ec3fb6..29b7164a823b 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1022,9 +1022,7 @@ static int menelaus_set_alarm(struct device *dev, struct rtc_wkalrm *w)
1022static void menelaus_rtc_update_work(struct menelaus_chip *m) 1022static void menelaus_rtc_update_work(struct menelaus_chip *m)
1023{ 1023{
1024 /* report 1/sec update */ 1024 /* report 1/sec update */
1025 local_irq_disable();
1026 rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_UF); 1025 rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_UF);
1027 local_irq_enable();
1028} 1026}
1029 1027
1030static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg) 1028static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg)
@@ -1086,9 +1084,7 @@ static const struct rtc_class_ops menelaus_rtc_ops = {
1086static void menelaus_rtc_alarm_work(struct menelaus_chip *m) 1084static void menelaus_rtc_alarm_work(struct menelaus_chip *m)
1087{ 1085{
1088 /* report alarm */ 1086 /* report alarm */
1089 local_irq_disable();
1090 rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_AF); 1087 rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_AF);
1091 local_irq_enable();
1092 1088
1093 /* then disable it; alarms are oneshot */ 1089 /* then disable it; alarms are oneshot */
1094 the_menelaus->rtc_control &= ~RTC_CTRL_AL_EN; 1090 the_menelaus->rtc_control &= ~RTC_CTRL_AL_EN;