Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8390170ybl; Thu, 16 Jan 2020 15:55:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxG78+/s7brZygbxuPMLNYMT33LqY+U9xuGPPc01+bbXn/+3BoWlXmNwEW06XH+aGNeqvuE X-Received: by 2002:aca:8d5:: with SMTP id 204mr1327804oii.141.1579218954426; Thu, 16 Jan 2020 15:55:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579218954; cv=none; d=google.com; s=arc-20160816; b=gQPtmwcbpOj3z8FfgvVz2vXslaIMT3be3GINnVd1yf/3asVC4O6VlBDqyvh8QuX76+ 09Gp83rldfM0IKfdeStcD+R9LEzqIDWpfMnu1K4yH72V9uc5yDzMr4kCOcEGRVCWkyag oBZYG44SpWLnexytdxpW/c7IzVFsNDwCP6kJcbexJNgoMeTw810r0aR8Tvl+HtnBybat HBwtT2uUvtZ9HnfY43LUzImB/iI0PrMdEKdsrVMlc7dl8eX7m8PNWS6ag/+s2IQZOdeO 5Zdl5tKrzYUSB1mSq47bmDLtXO23XWB5dYRN9Qq34dEDcYCZR8EUP2+8GyPF88gDEa3R RDDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qcQ9hT3WlUP5wHpd+zImaPWXdXx3EZws0JCgGrWCSZk=; b=URu9kpSvlpK7JX5Pan+ZBKRXNK+sgVIRw26UTbHEquwncOQOa0Rhoi19RoszOAmWMR poPev46fBhHYKc0qriflabe3pX4ih7J6+J9IqqDBxJDZG3xrU14YSJlGe7EdAF85Wuvi n0CA1sqX1gLhA3GTA3IGqT1SmATOgchggxfy54j9Tg6gbl/qk+xzNcEi/wdH9N66qX1Z 0uj52C9OnL3SC9DFcdEOVldRYgB7vcfBzTCr9i1uEI/S/uQ1G/urPSc4H4pkBLVVR7F2 YPVjoxiBPUXMyzBLGGE2iaHdcgu7EaV5OtAfR9N9ngrvRx2RyGYlVgWXukBSoXBDqEud xShg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V97JIN6P; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r1si13857955otk.251.2020.01.16.15.55.42; Thu, 16 Jan 2020 15:55:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V97JIN6P; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394817AbgAPSAs (ORCPT + 99 others); Thu, 16 Jan 2020 13:00:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:59388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405768AbgAPRll (ORCPT ); Thu, 16 Jan 2020 12:41:41 -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 7A20524695; Thu, 16 Jan 2020 17:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196500; bh=66Uh4hQFwl8UL/i/f+/bSnuAUf2QPxZlPm6iSXIho1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V97JIN6P8o84+RSqS9SbRQBYtCojBbLueZy2s3wBsZZDpXrBxnO+s0r9rVhikezya ssCDrHLyndQkseZ56bKjo65S6KJI9x8FnZ66ObnjgbZkA8iH6u/UFljqTZUi9w0UNA 48TK6lqyDEWKwEz1rIfxbiz7IoQnWNi4KAmevb8I= 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.9 242/251] rtc: msm6242: Fix reading of 10-hour digit Date: Thu, 16 Jan 2020 12:36:31 -0500 Message-Id: <20200116173641.22137-202-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-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 c1c5c4e3b3b4..c981301efbe5 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