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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A4CD3C07E99 for ; Sat, 10 Jul 2021 02:39:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8997761409 for ; Sat, 10 Jul 2021 02:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234574AbhGJCmS (ORCPT ); Fri, 9 Jul 2021 22:42:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235597AbhGJCji (ORCPT ); Fri, 9 Jul 2021 22:39:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AA6E0613CC; Sat, 10 Jul 2021 02:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884521; bh=AaxiyUJgb/wWIUCoEmwa22p47FjVGGBCNWT7ikz188s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=blYYA+oKWT6Xm/GQVvvDYBY2NFgud8BdhLTF56pHrcsN0+7y3nUms8MzkRJ+F33Hy KYuvy3buklL/P8xd+MsZpRUkRKBW1lyPdPMzPAQPBE4x3jjSElehje8FGXfBUiFH14 s9/3Am4HatEiW3rXeTAF8ObomU+Ia1qgbfXrCsI99NCuHxgKHNBMxcwAAYsljskiXg b444iM9hEpp50Qpp66hIAe1wqX3O1tHC0LpAphaYk1KWZ2Jhx9kfSjd0NOCqZXWmfS 3HWrm2yojZsT39VvYDnEC6Dm5SfE2A/kEHjw+SJbmBLT35px3WFIGcAVl4Ih9PM+Tn ZQK7c4qY1EEEg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luiz Sampaio , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.14 04/33] w1: ds2438: fixing bug that would always get page0 Date: Fri, 9 Jul 2021 22:34:46 -0400 Message-Id: <20210710023516.3172075-4-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710023516.3172075-1-sashal@kernel.org> References: <20210710023516.3172075-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luiz Sampaio [ Upstream commit 1f5e7518f063728aee0679c5086b92d8ea429e11 ] The purpose of the w1_ds2438_get_page function is to get the register values at the page passed as the pageno parameter. However, the page0 was hardcoded, such that the function always returned the page0 contents. Fixed so that the function can retrieve any page. Signed-off-by: Luiz Sampaio Link: https://lore.kernel.org/r/20210519223046.13798-5-sampaio.ime@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/w1/slaves/w1_ds2438.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/w1/slaves/w1_ds2438.c b/drivers/w1/slaves/w1_ds2438.c index 7c4e33dbee4d..b005dda9c697 100644 --- a/drivers/w1/slaves/w1_ds2438.c +++ b/drivers/w1/slaves/w1_ds2438.c @@ -64,13 +64,13 @@ static int w1_ds2438_get_page(struct w1_slave *sl, int pageno, u8 *buf) if (w1_reset_select_slave(sl)) continue; w1_buf[0] = W1_DS2438_RECALL_MEMORY; - w1_buf[1] = 0x00; + w1_buf[1] = (u8)pageno; w1_write_block(sl->master, w1_buf, 2); if (w1_reset_select_slave(sl)) continue; w1_buf[0] = W1_DS2438_READ_SCRATCH; - w1_buf[1] = 0x00; + w1_buf[1] = (u8)pageno; w1_write_block(sl->master, w1_buf, 2); count = w1_read_block(sl->master, buf, DS2438_PAGE_SIZE + 1); -- 2.30.2