summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Liu <kliu5@marvell.com>2012-03-23 15:02:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 16:58:39 -0700
commit0cf30bdd919685b201f715ea347dd96d590942e8 (patch)
tree24874c977ee5af2de3cf49362456cdd806e1531a
parentaa19689bfaaa26f2d85588a8774e194de5e7be54 (diff)
downloadlinux-3.10-0cf30bdd919685b201f715ea347dd96d590942e8.tar.gz
linux-3.10-0cf30bdd919685b201f715ea347dd96d590942e8.tar.bz2
linux-3.10-0cf30bdd919685b201f715ea347dd96d590942e8.zip
drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error
max8925_rtc_read_alarm should always return 0 with success Signed-off-by: Kevin Liu <kliu5@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-max8925.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 2d71943bc43..ff6b9a2cb8e 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -204,6 +204,7 @@ static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
alrm->pending = 1;
else
alrm->pending = 0;
+ return 0;
out:
return ret;
}