projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[linux-2.6-microblaze.git]
/
drivers
/
rtc
/
rtc-max8997.c
diff --git
a/drivers/rtc/rtc-max8997.c
b/drivers/rtc/rtc-max8997.c
index
08c661a
..
20e50d9
100644
(file)
--- a/
drivers/rtc/rtc-max8997.c
+++ b/
drivers/rtc/rtc-max8997.c
@@
-215,7
+215,7
@@
static int max8997_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
out:
mutex_unlock(&info->lock);
- return
0
;
+ return
ret
;
}
static int max8997_rtc_stop_alarm(struct max8997_rtc_info *info)