lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 650/671] rtc: msm6242: Fix reading of 10-hour digit
    Date
    From: Kars de Jong <jongk@linux-m68k.org>

    [ Upstream commit e34494c8df0cd96fc432efae121db3212c46ae48 ]

    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.

    Fixes: 4f9b9bba1dd1 ("rtc: Add an RTC driver for the Oki MSM6242")
    Tested-by: Kars de Jong <jongk@linux-m68k.org>
    Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
    Link: https://lore.kernel.org/r/20191116110548.8562-1-jongk@linux-m68k.org
    Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 0c72a2e8ec67..6aace9319fe9 100644
    --- a/drivers/rtc/rtc-msm6242.c
    +++ b/drivers/rtc/rtc-msm6242.c
    @@ -132,7 +132,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.20.1
    \
     
     \ /
      Last update: 2020-01-16 18:16    [W:2.447 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site