From d214bc2e37dbcbbab01672ac40f93d3e0c785d6b Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Mon, 21 Nov 2011 17:13:55 +0530 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/39113 Reviewed-by: QATEST Reviewed-by: QABUILD --- drivers/rtc/rtc-ab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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 = { -- cgit v1.2.3