LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] m68k: Fix calendar month regression on M68328
@ 2018-04-27  1:12 Finn Thain
  0 siblings, 0 replies; 3+ messages in thread
From: Finn Thain @ 2018-04-27  1:12 UTC (permalink / raw)
  To: Greg Ungerer; +Cc: Geert Uytterhoeven, linux-m68k, linux-kernel

My earlier fix for read_persistent_clock() neglected to cover
m68328_hwclk(). Correct this oversight.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Finn Thain <fthain@telegraphics.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.
---
 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;
-- 
2.16.1

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] m68k: Fix calendar month regression on M68328
@ 2018-04-27  1:33 Greg Ungerer
  2018-04-27  6:55 ` Geert Uytterhoeven
  0 siblings, 1 reply; 3+ messages in thread
From: Greg Ungerer @ 2018-04-27  1:33 UTC (permalink / raw)
  To: Finn Thain; +Cc: Geert Uytterhoeven, linux-m68k, linux-kernel

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@linux-m68k.org>
> Signed-off-by: Finn Thain <fthain@telegraphics.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@linux-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;
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-04-27  6:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-27  1:12 [PATCH] m68k: Fix calendar month regression on M68328 Finn Thain
2018-04-27  1:33 Greg Ungerer
2018-04-27  6:55 ` Geert Uytterhoeven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).