From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756091AbcIFKAo (ORCPT ); Tue, 6 Sep 2016 06:00:44 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:34644 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755697AbcIFKAf (ORCPT ); Tue, 6 Sep 2016 06:00:35 -0400 Date: Tue, 6 Sep 2016 11:58:08 +0200 (CEST) From: Thomas Gleixner To: Pratyush Anand cc: mingo@kernel.org, alexandre.belloni@free-electrons.com, hpa@zytor.com, x86@kernel.org, rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, prarit@redhat.com, dzickus@redhat.com, dyoung@redhat.com, a.zummo@towertech.it Subject: Re: [PATCH V3 2/2] rtc/rtc-cmos: Initialize software counters before irq is registered In-Reply-To: <90426708da5934284839e6f23d23e265afcc779f.1470985727.git.panand@redhat.com> Message-ID: References: <90426708da5934284839e6f23d23e265afcc779f.1470985727.git.panand@redhat.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 16 Aug 2016, Pratyush Anand wrote: That's a lot of churn to fix that simple problem. The two liner below should fix that as well, right? Thanks, tglx diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 43745cac0141..cb8dfc3ee012 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -707,6 +707,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup1; } + hpet_rtc_timer_init(); if (is_valid_irq(rtc_irq)) { irq_handler_t rtc_cmos_int_handler; @@ -714,6 +715,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) rtc_cmos_int_handler = hpet_rtc_interrupt; retval = hpet_register_irq_handler(cmos_interrupt); if (retval) { + hpet_mask_rtc_irq_bit(RTC_IRQMASK); dev_warn(dev, "hpet_register_irq_handler " " failed in rtc_init()."); goto cleanup1; @@ -729,7 +731,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup1; } } - hpet_rtc_timer_init(); /* export at least the first block of NVRAM */ nvram.size = address_space - NVRAM_OFFSET;