rtc: mc146818-lib: Adjust failure return code for mc146818_get_time()
authorMario Limonciello <mario.limonciello@amd.com>
Tue, 28 Nov 2023 05:36:50 +0000 (23:36 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Feb 2024 00:18:56 +0000 (16:18 -0800)
commit af838635a3eb9b1bc0d98599c101ebca98f31311 upstream.

mc146818_get_time() calls mc146818_avoid_UIP() to avoid fetching the
time while RTC update is in progress (UIP). When this fails, the return
code is -EIO, but actually there was no IO failure.

The reason for the return from mc146818_avoid_UIP() is that the UIP
wasn't cleared in the time period. Adjust the return code to -ETIMEDOUT
to match the behavior.

Tested-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Reviewed-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Acked-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Cc: <stable@vger.kernel.org>
Fixes: 2a61b0ac5493 ("rtc: mc146818-lib: refactor mc146818_get_time")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20231128053653.101798-2-mario.limonciello@amd.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/rtc/rtc-mc146818-lib.c

index f1c09f1..43a28e8 100644 (file)
@@ -138,7 +138,7 @@ int mc146818_get_time(struct rtc_time *time)
 
        if (!mc146818_avoid_UIP(mc146818_get_time_callback, &p)) {
                memset(time, 0, sizeof(*time));
-               return -EIO;
+               return -ETIMEDOUT;
        }
 
        if (!(p.ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)