]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
rtc: mc146818-lib: change return values of mc146818_get_time()
authorMateusz Jończyk <mat.jonczyk@o2.pl>
Fri, 10 Dec 2021 20:01:24 +0000 (21:01 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 27 Apr 2022 09:59:28 +0000 (11:59 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969107
[ Upstream commit d35786b3a28dee20b12962ae2dd365892a99ed1a ]

No function is checking mc146818_get_time() return values yet, so
correct them to make them more customary.

Signed-off-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20211210200131.153887-3-mat.jonczyk@o2.pl
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 8c69210752228d141c6e690eda98945265902870)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/rtc/rtc-mc146818-lib.c

index 04b05e3b68cb85dd3d619d3d5ad35224960b3e3b..bd48cee3027e213df125d4da5a97e9ce4b5810e7 100644 (file)
@@ -25,7 +25,7 @@ again:
        if (WARN_ON_ONCE((CMOS_READ(RTC_VALID) & 0x40) != 0)) {
                spin_unlock_irqrestore(&rtc_lock, flags);
                memset(time, 0xff, sizeof(*time));
-               return 0;
+               return -EIO;
        }
 
        /*
@@ -116,7 +116,7 @@ again:
 
        time->tm_mon--;
 
-       return RTC_24H;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(mc146818_get_time);