| From 760e62348ecb1e1b5d5b33c70b6a20e67845a4af Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 May 2021 19:30:44 -0300 |
| Subject: w1: ds2438: fixing bug that would always get page0 |
| |
| From: Luiz Sampaio <sampaio.ime@gmail.com> |
| |
| [ 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 <sampaio.ime@gmail.com> |
| Link: https://lore.kernel.org/r/20210519223046.13798-5-sampaio.ime@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 5cfb0ae23e91..5698566b0ee0 100644 |
| --- a/drivers/w1/slaves/w1_ds2438.c |
| +++ b/drivers/w1/slaves/w1_ds2438.c |
| @@ -62,13 +62,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 |
| |
