Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05f45d7d authored by Werner Almesberger's avatar Werner Almesberger Committed by Linus Torvalds
Browse files

rtc: pcf50633: consider alrm->enable in pcf50633_rtc_set_alarm 



According to Documentation/rtc.txt, RTC_WKALM_SET sets the alarm time and
enables/disables the alarm.  We implement RTC_WKALM_SET through
pcf50633_rtc_set_alarm.  The enabling/disabling part was missing.

Signed-off-by: default avatarWerner Almesberger <werner@openmoko.org>
Reported-by: default avatarMichael 'Mickey' Lauer <mickey@openmoko.org>
Signed-off-by: default avatarPaul Fertser <fercerpav@gmail.com>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: Balaji Rao <balajirrao@openmoko.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 265f2a05

drivers/rtc/rtc-pcf50633.c

+2 −1
Original line number Diff line number Diff line
@@ -245,8 +245,9 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,

				PCF50633_TI_EXTENT, &pcf_tm.time[0]);



	if (!alarm_masked)

	if (!alarm_masked || alrm->enabled)

		pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);

	rtc->alarm_enabled = alrm->enabled;



	return ret;

}