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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 7258FC04E84 for ; Wed, 15 May 2019 11:08:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C2092084F for ; Wed, 15 May 2019 11:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918527; bh=padmvTkWg5zdy68O3Y6L1Nh372VuQTxBAROzBv7ysBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KAYsZDb40Zmog9nMJwjqsaBUdXzrFq0EEpjvsQxQwNoFZJ5j9/6Z732OlClqVB7s/ jTf3S60TM1WAVJLFFefOkWCyjFS4ZZUJZx2SNg2xpFIN1K7c/OB7t97I2f+iPdK2RY d5vLPQApYYMEWYGA5x/XUuSbqWZLjTTcWXfMusTU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728650AbfEOLIq (ORCPT ); Wed, 15 May 2019 07:08:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:41260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728907AbfEOLIp (ORCPT ); Wed, 15 May 2019 07:08:45 -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 7D00720644; Wed, 15 May 2019 11:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918525; bh=padmvTkWg5zdy68O3Y6L1Nh372VuQTxBAROzBv7ysBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WliyrWFGPJVCsczkOE+Y4QdSDU85U8mM58f1C9jbbY3Kpjqr2obwdTTOaTm85fuAy AYDIZf6ixq1PYo0WW6cUW+Ztdfnxb2DfGGN4UWncDrQSUOM68n9YsEskBkpEDU0Y28 KNtyNFphHGkRXy6SCe4uKu5cmZyqGxpEIlPfLDSU= 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.4 121/266] rtc: sh: Fix invalid alarm warning for non-enabled alarm Date: Wed, 15 May 2019 12:53:48 +0200 Message-Id: <20190515090726.642641982@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@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 2b81dd4baf17..104c854d6a8a 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -455,7 +455,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