From patchwork Tue Aug 9 19:54:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101967 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp60786qga; Tue, 9 Aug 2016 12:58:06 -0700 (PDT) X-Received: by 10.66.216.69 with SMTP id oo5mr163336pac.155.1470772686735; Tue, 09 Aug 2016 12:58:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sm2si44151461pac.36.2016.08.09.12.57.55; Tue, 09 Aug 2016 12:58:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644AbcHIT5w (ORCPT + 27 others); Tue, 9 Aug 2016 15:57:52 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:65006 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429AbcHIT5v (ORCPT ); Tue, 9 Aug 2016 15:57:51 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MLnvv-1bWw8i1iHz-000rsC; Tue, 09 Aug 2016 21:55:35 +0200 From: Arnd Bergmann To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Cc: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Geert Uytterhoeven , Alexandre Belloni , Alessandro Zummo , rtc-linux@googlegroups.com, Arnd Bergmann , Borislav Petkov , linux-kernel@vger.kernel.org Subject: [PATCH] x86/hpet: fix typo from rtc cleanup Date: Tue, 9 Aug 2016 21:54:53 +0200 Message-Id: <20160809195528.1604312-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:Q+aRvNe7YJxWncncIroQTMNwqhtGigK8t2e8TC4xPTawsM3rCqg 5WMzwMK0Y5OFRsFTJNv5NnklvC4VjDqvswgl95k9xoyYrSIGtUb5L9/NlLLf/7oUnSrYKch u4S3Ss5ye1SumuhmhoGf+j6iHaw4gnlIpRd4XdgEKa2tJkQmwGwuDljZZKIA/sm5wbaf9PZ PBvkq+30cz17JH/LjN98w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Uxi3WuMuaXc=:zwZQ+5CADDy5KTYvcL9avj KGAKW+vtpIgrOTCL+brFyLmUJwpAjy7NIp5mrOxDeDLwcWYW7mcQmE+kHDqSrY8Y95mBltLF+ elTGXq0X6NFS9meN+04tLLVYHcYyUTATeOq9DByN2ObMlg3SCDWo6TKGCR+G4SuMpgcU9JK3g It/AZYa2extFFI0gt+2L9gMgVPBjBhDHbZ5suUpiwdpZozx8KY3593MbNoSdHy3SRxTyadh6t OvOGTUso+umu4aG5BRoLjAzrwTI2930l7lp6CaoRkTne5yUO0E50wlFZtijWqf7IqiscTdx2i cCXrk3NpSktpY4/3Esj2Hme0v+b7CZKLAAKqphPUwQfjfmokX9+16aKgfWFhfgLtTCnzi/b7S UasSZl0nl2Wnwku7Yc0MD3fnxTINlMc78vub3gTOFreF/Qwiv8on/dqlsdeggUXTk9dQvt6ei V05I2PP2GJrmaD0YMITo4siZYJZfxqv1nzNd3cmMh7H2g/g3jm9qQvcVGGRRqubH84X05+guG kPQbE8ssafYR2xmLrMtd8t5FvCnb+/z/HLoNtu2BxOovrP7U/DHsVWhSx8drW0Bf3QNSU2r0c y8nuYNmGb5hQEVuUkGSoqcC85gePQeHHspjhXSNK91ZohyCSZOkkNA78LfL1oH+bI3svIbNPb iyWiCXUtVxN8Gz4CpUHweXy9N6cGPh/imdpy7m7+jM2vtcagC3isa4EOiOin5kZnEnn/0BXI6 +ogm7MVm2amxRy+0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ville Syrjälä reports "The first time I run hwclock after rebooting I get this: open("/dev/rtc", O_RDONLY) = 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0 select(4, [3], NULL, NULL, {10, 0}) = 0 (Timeout) ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0 close(3) = 0 On all subsequent runs I get this: open("/dev/rtc", O_RDONLY) = 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = -1 EINVAL (Invalid argument) ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) = -1 EINVAL (Invalid argument) close(3) = 0" This was caused by a stupid typo in a patch that should have been a simple rename to move around contents of a header file, but accidentally wrote zeroes into the rtc rather than reading from it. Signed-off-by: Arnd Bergmann Reported-by: Ville Syrjälä Tested-by: Ville Syrjälä Fixes: 463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h") --- arch/x86/kernel/hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index ed16e58658a4..c6dfd801df97 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) memset(&curr_time, 0, sizeof(struct rtc_time)); if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) - mc146818_set_time(&curr_time); + mc146818_get_time(&curr_time); if (hpet_rtc_flags & RTC_UIE && curr_time.tm_sec != hpet_prev_update_sec) {