[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <d59432ee-15a3-495b-29db-2d2eb51be97d@linux-m68k.org>
Date: Fri, 27 Apr 2018 11:33:12 +1000
From: Greg Ungerer <gerg@...ux-m68k.org>
To: Finn Thain <fthain@...egraphics.com.au>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>,
linux-m68k@...ts.linux-m68k.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] m68k: Fix calendar month regression on M68328
Hi Finn,
On 27/04/18 11:12, Finn Thain wrote:
> My earlier fix for read_persistent_clock() neglected to cover
> m68328_hwclk(). Correct this oversight.
>
> Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
> Signed-off-by: Finn Thain <fthain@...egraphics.com.au>
> ---
> Greg, the read_persistent_clock() change has already been queued
> by Geert. Should this patch be pushed together with that one
> (presuming your ack)? Sorry for the inconvenience.
If Geert is happy to add it to his tree that would seem to make sense.
Otherwise I can take it via the m68knommu tree. Either way:
Acked-by: Greg Ungerer <gerg@...ux-m68k.org>
Regards
Greg
> ---
> arch/m68k/68000/timers.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c
> index 252455bce144..71ddb4c98726 100644
> --- a/arch/m68k/68000/timers.c
> +++ b/arch/m68k/68000/timers.c
> @@ -125,7 +125,9 @@ int m68328_hwclk(int set, struct rtc_time *t)
> {
> if (!set) {
> long now = RTCTIME;
> - t->tm_year = t->tm_mon = t->tm_mday = 1;
> + t->tm_year = 1;
> + t->tm_mon = 0;
> + t->tm_mday = 1;
> t->tm_hour = (now >> 24) % 24;
> t->tm_min = (now >> 16) % 60;
> t->tm_sec = now % 60;
>
Powered by blists - more mailing lists