summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-11-21 17:13:55 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:12 +0200
commitd214bc2e37dbcbbab01672ac40f93d3e0c785d6b (patch)
tree4459f1a6ba6869a26b330fee357c1d733753f2ce
parentc33b4a6e9b68f64c09519b5521815a4b5aa3b956 (diff)
rtc: ab: only enable alarm in set_alarm if requested
We should not enable the alarm if alarm->enabled is false. ST-Ericsson ID: 375473 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I8a73bc3752fbdbd19783a426a76213d35b48a870 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/39113 Reviewed-by: QATEST Reviewed-by: QABUILD
-rw-r--r--drivers/rtc/rtc-ab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ab.c b/drivers/rtc/rtc-ab.c
index db1992632fa..393dd5a0e09 100644
--- a/drivers/rtc/rtc-ab.c
+++ b/drivers/rtc/rtc-ab.c
@@ -370,7 +370,7 @@ static int ab_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
return err;
}
- return ab_rtc_alarm_enable(dev, true);
+ return alarm->enabled ? ab_rtc_alarm_enable(dev, true) : 0;
}
static const struct rtc_class_ops ab_rtc_ops = {