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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 16DDEC33CAF for ; Thu, 16 Jan 2020 17:14:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D33C124690 for ; Thu, 16 Jan 2020 17:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194871; bh=8cY0lhb2As8j2MTW3fqxxsG0Os5auK3r8F7h9ClHNOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=th+ARPhGUhmRVtF7CPf+7bxYyxw09iiIH2OmmXG+fuCCaQ+bLkrtvd3iNlvkMshIx /NPHjSBOWWsgSBuc+cRtP8jX8ar40hBhmSoNLSuGNzowfYcIzXqZi6pxOWAndKiTWb 1Y+Wbcg685ZoUGhBmTBuy78e003GIkkSX0wvJIiY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391001AbgAPROb (ORCPT ); Thu, 16 Jan 2020 12:14:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:32902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390946AbgAPROP (ORCPT ); Thu, 16 Jan 2020 12:14:15 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 99A6F246B8; Thu, 16 Jan 2020 17:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194854; bh=8cY0lhb2As8j2MTW3fqxxsG0Os5auK3r8F7h9ClHNOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTDvVBnBky/HvFMcSv/2o7snmRb0Y5cWpkjzpIvRvaf0PRdZtCFMKdzGjNSJrmV+a 18QbiJHN2KuD6glXTPmO6z7AKnwlB6+bsTBkE+M6gPVP56iZRo9SeoB1j9mpiy0J/d 8hrBih4nPZtETMa+2LWUPgc7t9LnBoSMk047UEXw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kars de Jong , Geert Uytterhoeven , Alexandre Belloni , Sasha Levin , linux-rtc@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 650/671] rtc: msm6242: Fix reading of 10-hour digit Date: Thu, 16 Jan 2020 12:04:48 -0500 Message-Id: <20200116170509.12787-387-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit e34494c8df0cd96fc432efae121db3212c46ae48 ] 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: Sasha Levin --- drivers/rtc/rtc-msm6242.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c index 0c72a2e8ec67..6aace9319fe9 100644 --- a/drivers/rtc/rtc-msm6242.c +++ b/drivers/rtc/rtc-msm6242.c @@ -132,7 +132,8 @@ static int msm6242_read_time(struct device *dev, struct rtc_time *tm) 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); -- 2.20.1