LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Greg Ungerer <gerg@linux-m68k.org>
To: Finn Thain <fthain@telegraphics.com.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] m68k: Fix calendar month regression on M68328
Date: Fri, 27 Apr 2018 11:33:12 +1000	[thread overview]
Message-ID: <d59432ee-15a3-495b-29db-2d2eb51be97d@linux-m68k.org> (raw)

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;
> 

             reply	other threads:[~2018-04-27  1:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27  1:33 Greg Ungerer [this message]
2018-04-27  6:55 ` Geert Uytterhoeven
  -- strict thread matches above, loose matches on Subject: below --
2018-04-27  1:12 Finn Thain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d59432ee-15a3-495b-29db-2d2eb51be97d@linux-m68k.org \
    --to=gerg@linux-m68k.org \
    --cc=fthain@telegraphics.com.au \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --subject='Re: [PATCH] m68k: Fix calendar month regression on M68328' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).