git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rtc-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[sfrench/cifs-2.6.git]
/
drivers
/
rtc
/
rtc-tps65910.c
diff --git
a/drivers/rtc/rtc-tps65910.c
b/drivers/rtc/rtc-tps65910.c
index 8556d925e52a4d7adaf6affe30342e080f2d4517..7078f6da1cbcf507532835bd1f5f04dad7948ebd 100644
(file)
--- a/
drivers/rtc/rtc-tps65910.c
+++ b/
drivers/rtc/rtc-tps65910.c
@@
-143,7
+143,7
@@
static int tps65910_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
struct tps65910 *tps = dev_get_drvdata(dev->parent);
int ret;
struct tps65910 *tps = dev_get_drvdata(dev->parent);
int ret;
- ret = regmap_bulk_read(tps->regmap, TPS65910_SECONDS, alarm_data,
+ ret = regmap_bulk_read(tps->regmap, TPS65910_
ALARM_
SECONDS, alarm_data,
NUM_TIME_REGS);
if (ret < 0) {
dev_err(dev, "rtc_read_alarm error %d\n", ret);
NUM_TIME_REGS);
if (ret < 0) {
dev_err(dev, "rtc_read_alarm error %d\n", ret);