2019-11-16 11:08:12

by Kars de Jong

[permalink] [raw]
Subject: [PATCH] rtc: msm6242: Fix reading of 10-hour digit

The driver was reading the wrong register as the 10-hour digit due to
a misplaced ')'. It was in fact reading the 1-second digit register due
to this bug.

Also remove the use of a magic number for the hour mask and use the define
for it which was already present.

Cc: Geert Uytterhoeven <[email protected]>
Tested-by: Kars de Jong <[email protected]>
Signed-off-by: Kars de Jong <[email protected]>
---
drivers/rtc/rtc-msm6242.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c
index 1c2d3c4a4963..b1f2bedee77e 100644
--- a/drivers/rtc/rtc-msm6242.c
+++ b/drivers/rtc/rtc-msm6242.c
@@ -133,7 +133,8 @@ static int msm6242_read_time(struct device *dev, struct rtc_time *tm)
msm6242_read(priv, MSM6242_SECOND1);
tm->tm_min = msm6242_read(priv, MSM6242_MINUTE10) * 10 +
msm6242_read(priv, MSM6242_MINUTE1);
- tm->tm_hour = (msm6242_read(priv, MSM6242_HOUR10 & 3)) * 10 +
+ tm->tm_hour = (msm6242_read(priv, MSM6242_HOUR10) &
+ MSM6242_HOUR10_HR_MASK) * 10 +
msm6242_read(priv, MSM6242_HOUR1);
tm->tm_mday = msm6242_read(priv, MSM6242_DAY10) * 10 +
msm6242_read(priv, MSM6242_DAY1);
--
2.17.1


2019-11-16 11:39:54

by Kars de Jong

[permalink] [raw]
Subject: Re: [PATCH] rtc: msm6242: Fix reading of 10-hour digit

Forgot to add:

Fixes: 4f9b9bba1dd1 ("rtc: Add an RTC driver for the Oki MSM6242")

Op za 16 nov. 2019 om 12:06 schreef Kars de Jong <[email protected]>:
>
> The driver was reading the wrong register as the 10-hour digit due to
> a misplaced ')'. It was in fact reading the 1-second digit register due
> to this bug.
>
> Also remove the use of a magic number for the hour mask and use the define
> for it which was already present.
>
> Cc: Geert Uytterhoeven <[email protected]>
> Tested-by: Kars de Jong <[email protected]>
> Signed-off-by: Kars de Jong <[email protected]>

2019-11-18 14:16:36

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] rtc: msm6242: Fix reading of 10-hour digit

On Sat, Nov 16, 2019 at 12:06 PM Kars de Jong <[email protected]> wrote:
> The driver was reading the wrong register as the 10-hour digit due to
> a misplaced ')'. It was in fact reading the 1-second digit register due
> to this bug.
>
> Also remove the use of a magic number for the hour mask and use the define
> for it which was already present.
>
> Cc: Geert Uytterhoeven <[email protected]>
> Tested-by: Kars de Jong <[email protected]>
> Signed-off-by: Kars de Jong <[email protected]>

Reviewed-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2019-11-18 14:20:21

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] rtc: msm6242: Fix reading of 10-hour digit

On 16/11/2019 12:05:48+0100, Kars de Jong wrote:
> The driver was reading the wrong register as the 10-hour digit due to
> a misplaced ')'. It was in fact reading the 1-second digit register due
> to this bug.
>
> Also remove the use of a magic number for the hour mask and use the define
> for it which was already present.
>
> Cc: Geert Uytterhoeven <[email protected]>
> Tested-by: Kars de Jong <[email protected]>
> Signed-off-by: Kars de Jong <[email protected]>
> ---
> drivers/rtc/rtc-msm6242.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Applied, thanks.

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com