From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2575FC04A6B for ; Mon, 6 May 2019 14:52:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E416D2053B for ; Mon, 6 May 2019 14:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154357; bh=d5H7LD/60AOvjT9IW8lrl/lZYPLcTuJ6p9oJaAylqqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xktKXReOxIfhQ7nrxDNb8tQPBWsRS+w6l+fXWxLtHvGDFlH94rdFwxZjeXPQnGsv4 UVOo8pDCdTJBYWpWv8eDoRz+VODVBw2rPp4JFPaIgko5iE3D2/weJf1huhBarq5BqV ku+R2D2R9T3Pkvvc01Ia1xvhGMGBkggIsBPsnJeY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728728AbfEFOsI (ORCPT ); Mon, 6 May 2019 10:48:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:47982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729416AbfEFOsE (ORCPT ); Mon, 6 May 2019 10:48:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 702772053B; Mon, 6 May 2019 14:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154083; bh=d5H7LD/60AOvjT9IW8lrl/lZYPLcTuJ6p9oJaAylqqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aH6OLn1xWYvwRdJxeIPpuSGWymwWFgkIgicqgNLKwKhN5pmw9LMvuPcba2vdCtbmv IvMkFf0YoPCLjag7dqmLmn3pX/S77Kt1n9SjRYwG551e962YUKa1s5MfTzogSpf6rs z9cyhOGQDnIIKxk5EBmWSjlWLZWKw5zI5nNROG7E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Alexandre Belloni , Sasha Levin Subject: [PATCH 4.9 30/62] rtc: sh: Fix invalid alarm warning for non-enabled alarm Date: Mon, 6 May 2019 16:33:01 +0200 Message-Id: <20190506143053.662813531@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143051.102535767@linuxfoundation.org> References: <20190506143051.102535767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 15d82d22498784966df8e4696174a16b02cc1052 ] When no alarm has been programmed on RSK-RZA1, an error message is printed during boot: rtc rtc0: invalid alarm value: 2019-03-14T255:255:255 sh_rtc_read_alarm_value() returns 0xff when querying a hardware alarm field that is not enabled. __rtc_read_alarm() validates the received alarm values, and fills in missing fields when needed. While 0xff is handled fine for the year, month, and day fields, and corrected as considered being out-of-range, this is not the case for the hour, minute, and second fields, where -1 is expected for missing fields. Fix this by returning -1 instead, as this value is handled fine for all fields. Signed-off-by: Geert Uytterhoeven Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/rtc-sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 17b6235d67a5..600fb7f93939 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -454,7 +454,7 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm) static inline int sh_rtc_read_alarm_value(struct sh_rtc *rtc, int reg_off) { unsigned int byte; - int value = 0xff; /* return 0xff for ignored values */ + int value = -1; /* return -1 for ignored values */ byte = readb(rtc->regbase + reg_off); if (byte & AR_ENB) { -- 2.20.1