aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-07-03 15:06:45 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-21 18:21:28 -0700
commite64c0641beee09a0d9870efc5ea40eb06b6529cb (patch)
tree8429c28a338f2ce234f1190d5b44bfdd063a3ec2
parent3dc8601b54d7efa6ccf94b5159dd79b179a965dc (diff)
downloadvexpress-lsk-e64c0641beee09a0d9870efc5ea40eb06b6529cb.tar.gz
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 5032c24ec15..9100a3401de 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;