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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 8D7C0C33CB3 for ; Thu, 16 Jan 2020 23:33:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 546CD2073A for ; Thu, 16 Jan 2020 23:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217636; bh=wbfoAA42oX5l4yauXATlXAMyCq6qjlKLDgmai3tPlJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=esQh4huqP9m62udwE6OgFoU6E68wRIzisuB8K0WURlMqtVLk1xoaHgoAbF8bHWNRn OKtusObtG3eLIuuQz2xfuCFJaIoAf6TgoCKJMwmpJybYbo0e0VIQ+zPpOhQQ/e6N13 SJ41W19nad+46e8qW70y06CLxoUnexLIu6rHI6mE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391609AbgAPXdz (ORCPT ); Thu, 16 Jan 2020 18:33:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:44708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404407AbgAPXdw (ORCPT ); Thu, 16 Jan 2020 18:33:52 -0500 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 5BD3120661; Thu, 16 Jan 2020 23:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217631; bh=wbfoAA42oX5l4yauXATlXAMyCq6qjlKLDgmai3tPlJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ri/3L4L98E7go1RAC5hWI9se+FbQrWy3scpHt59uD4DLSq7YjaJm+6z6Ci16+Lj9+ zj0MyEw9P1UJ6Gjwustknc/E0OXZRPo63DLw3pSzT6cTHEakA525k8VDffLNqzXuUv RuoyVydCjbk305o7kJUige+zYB4nZFM+uYJ51gZM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kars de Jong , Geert Uytterhoeven , Alexandre Belloni Subject: [PATCH 4.14 61/71] rtc: msm6242: Fix reading of 10-hour digit Date: Fri, 17 Jan 2020 00:18:59 +0100 Message-Id: <20200116231717.912765709@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231709.377772748@linuxfoundation.org> References: <20200116231709.377772748@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kars de Jong commit e34494c8df0cd96fc432efae121db3212c46ae48 upstream. The driver was reading the wrong register as the 10-hour digit due to a misplaced ')'. It was in fact reading the 1-second digit register due to this bug. Also remove the use of a magic number for the hour mask and use the define for it which was already present. Fixes: 4f9b9bba1dd1 ("rtc: Add an RTC driver for the Oki MSM6242") Tested-by: Kars de Jong Signed-off-by: Kars de Jong Link: https://lore.kernel.org/r/20191116110548.8562-1-jongk@linux-m68k.org Reviewed-by: Geert Uytterhoeven Signed-off-by: Alexandre Belloni Signed-off-by: Greg Kroah-Hartman --- drivers/rtc/rtc-msm6242.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/rtc/rtc-msm6242.c +++ b/drivers/rtc/rtc-msm6242.c @@ -132,7 +132,8 @@ static int msm6242_read_time(struct devi msm6242_read(priv, MSM6242_SECOND1); tm->tm_min = msm6242_read(priv, MSM6242_MINUTE10) * 10 + msm6242_read(priv, MSM6242_MINUTE1); - tm->tm_hour = (msm6242_read(priv, MSM6242_HOUR10 & 3)) * 10 + + tm->tm_hour = (msm6242_read(priv, MSM6242_HOUR10) & + MSM6242_HOUR10_HR_MASK) * 10 + msm6242_read(priv, MSM6242_HOUR1); tm->tm_mday = msm6242_read(priv, MSM6242_DAY10) * 10 + msm6242_read(priv, MSM6242_DAY1);