summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-07-03 15:06:45 -0700
committerBen Hutchings <ben@decadent.org.uk>2013-07-27 05:34:29 +0100
commitc8b425eba162f29a3544ad8d137194428a9e7411 (patch)
tree27f5d6fc9280ce80ed2613a421bd6c4ed121cd19
parent00bbe5df5c7cc4ddbd0e735b9056eec8f4b2ce0f (diff)
downloadlwn-c8b425eba162f29a3544ad8d137194428a9e7411.tar.gz
lwn-c8b425eba162f29a3544ad8d137194428a9e7411.zip
drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq
commit 29ecd78c0fd6ee05f2c6b07b23823a6ae43c13ff upstream. In the disable AIE irq code path, current code passes "1" to enable parameter of rv3029c2_rtc_i2c_alarm_set_irq(). Thus it does not disable AIE irq. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Heiko Schocher <hs@denx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/rtc/rtc-rv3029c2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index ea09ff211dc6..5317d946b7a8 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -310,7 +310,7 @@ static int rv3029c2_rtc_i2c_set_alarm(struct i2c_client *client,
dev_dbg(&client->dev, "alarm IRQ armed\n");
} else {
/* disable AIE irq */
- ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 1);
+ ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 0);
if (ret)
return ret;