From: Paul Fertser <fercerpav@gmail.com>
To: Alessandro Zummo <a.zummo@towertech.it>
Cc: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com,
Werner Almesberger <werner@openmoko.org>,
Paul Fertser <fercerpav@gmail.com>
Subject: [PATCH 2/3] rtc: pcf50633: consider alrm->enable in pcf50633_rtc_set_alarm
Date: Thu, 5 Nov 2009 00:55:16 +0300 [thread overview]
Message-ID: <1257371717-547-3-git-send-email-fercerpav@gmail.com> (raw)
In-Reply-To: <1257371717-547-2-git-send-email-fercerpav@gmail.com>
From: Werner Almesberger <werner@openmoko.org>
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: Werner Almesberger <werner@openmoko.org>
Reported-by: Michael 'Mickey' Lauer <mickey@openmoko.org>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
---
drivers/rtc/rtc-pcf50633.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index 77b40dd..33a10c4 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -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;
}
--
1.6.0.6
next prev parent reply other threads:[~2009-11-04 22:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-04 21:55 [PATCH 0/3] rtc: pcf50633 fixes (is rtc maintainer around?) Paul Fertser
2009-11-04 21:55 ` [PATCH 1/3] rtc: pcf50633: Fix month off-by-one error Paul Fertser
2009-11-04 21:55 ` Paul Fertser [this message]
2009-11-04 21:55 ` [PATCH 3/3] rtc: pcf50633: manage RTC alarm "pending" flag Paul Fertser
2009-11-10 22:54 ` [PATCH 0/3] rtc: pcf50633 fixes (is rtc maintainer around?) Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1257371717-547-3-git-send-email-fercerpav@gmail.com \
--to=fercerpav@gmail.com \
--cc=a.zummo@towertech.it \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
--cc=werner@openmoko.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome