summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-max77686.c
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2018-11-14 00:36:45 +0100
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2018-11-14 10:44:43 +0100
commitb28cc6cec3d814f5184cbebb2d1f987e769f534a (patch)
tree134e3420b0ac73debce9c3d0bbf78e84dfe3f9cc /drivers/rtc/rtc-max77686.c
parentrtc: s3c-rtc: Avoid using broken ALMYEAR register (diff)
downloadlinux-b28cc6cec3d814f5184cbebb2d1f987e769f534a.tar.xz
linux-b28cc6cec3d814f5184cbebb2d1f987e769f534a.zip
rtc: max77686: Fix the returned value in case of error in 'max77686_rtc_read_time()'
In case of error, we return 0. This is spurious and not consistent with the other functions of the driver. Commit e115a2bf1426 has modified more than what is said in the commit message. Reverse part of it znd return an error when needed, as it was previously. Fixes: e115a2bf1426 ("rtc: max77686: stop validating rtc_time in .read_time") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to '')
-rw-r--r--drivers/rtc/rtc-max77686.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 8a60900d6b8b..4aff349ae301 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -360,7 +360,7 @@ static int max77686_rtc_read_time(struct device *dev, struct rtc_time *tm)
out:
mutex_unlock(&info->lock);
- return 0;
+ return ret;
}
static int max77686_rtc_set_time(struct device *dev, struct rtc_time *tm)