From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: linux-rtc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH v3 2/9] rtc; pcf2123: fix possible alarm race condition
Date: Mon, 19 Aug 2019 20:26:49 +0200 [thread overview]
Message-ID: <20190819182656.29744-2-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20190819182656.29744-1-alexandre.belloni@bootlin.com>
Clear the flag after disabling the alarm to ensure the alarm doesn't fire
between clearing the flag and disabling the alarm.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-pcf2123.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 5f604d83289c..829d7a2dd950 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -274,13 +274,13 @@ static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
dev_dbg(dev, "%s: alm is %ptR\n", __func__, &alm->time);
- /* Ensure alarm flag is clear */
- ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AF, 0);
+ /* Disable alarm interrupt */
+ ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AIE, 0);
if (ret)
return ret;
- /* Disable alarm interrupt */
- ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AIE, 0);
+ /* Ensure alarm flag is clear */
+ ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AF, 0);
if (ret)
return ret;
--
2.21.0
next prev parent reply other threads:[~2019-08-19 18:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 18:26 [PATCH v3 1/9] rtc: pcf2123: don't use weekday alarm Alexandre Belloni
2019-08-19 18:26 ` Alexandre Belloni [this message]
2019-08-19 18:26 ` [PATCH v3 3/9] rtc: pcf2123: implement .alarm_irq_enable Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 4/9] rtc: pcf2123: stop using dev.platform_data Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 5/9] rtc: pcf2123: rename struct and variables Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 6/9] rtc: pcf2123: remove useless error path goto Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 7/9] rtc: pcf2123: convert to devm_rtc_allocate_device Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 8/9] rtc: pcf2123: let the core handle range offsetting Alexandre Belloni
2019-08-19 18:26 ` [PATCH v3 9/9] rtc: pcf2123: add proper compatible string Alexandre Belloni
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=20190819182656.29744-2-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).