commit ea853beae908ef331233505889f025cd7ecafd28
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 28 03:34:49 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 28 03:34:47 2014 -0700
tree c10c67d300e8daa5d3bec23986de9925c74df26b
parent 6e86b436941a69c8bac552a5352264373562ec7a
parent 3baf699818cbf63e5c9f70278664a2691d84ebcd

Merge "rtc: qpnp-rtc: Set alarm control register properly"

drivers/rtc/qpnp-rtc.c

diff --git a/drivers/rtc/qpnp-rtc.c b/drivers/rtc/qpnp-rtc.c
index d64b577..de86577 100644
--- a/drivers/rtc/qpnp-rtc.c
+++ b/drivers/rtc/qpnp-rtc.c
@@ -553,8 +553,15 @@
 		goto fail_rtc_enable;
 	}
 
+	rc = qpnp_read_wrapper(rtc_dd, &rtc_dd->alarm_ctrl_reg1,
+				rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1);
+	if (rc) {
+		dev_err(&spmi->dev,
+			"Read from  Alarm control reg failed\n");
+		goto fail_rtc_enable;
+	}
 	/* Enable abort enable feature */
-	rtc_dd->alarm_ctrl_reg1 = BIT_RTC_ABORT_ENABLE;
+	rtc_dd->alarm_ctrl_reg1 |= BIT_RTC_ABORT_ENABLE;
 	rc = qpnp_write_wrapper(rtc_dd, &rtc_dd->alarm_ctrl_reg1,
 			rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1);
 	if (rc) {