diff options
| author | Lucas Denefle <lucas.denefle@converge.io> | 2022-02-23 11:35:55 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-15 14:15:03 +0200 |
| commit | 789988e2f2b1d7d1a4fd6f820917016484dbf558 (patch) | |
| tree | 2dbc5dd1649e64d8ae86600124455a090d325ae6 | |
| parent | 1e395306ba950f70c93d7e8980cb99dc4081b47d (diff) | |
| download | linux-stable-789988e2f2b1d7d1a4fd6f820917016484dbf558.tar.gz linux-stable-789988e2f2b1d7d1a4fd6f820917016484dbf558.tar.bz2 linux-stable-789988e2f2b1d7d1a4fd6f820917016484dbf558.zip | |
w1: w1_therm: fixes w1_seq for ds28ea00 sensors
[ Upstream commit 41a92a89eee819298f805c40187ad8b02bb53426 ]
w1_seq was failing due to several devices responding to the
CHAIN_DONE at the same time. Now properly selects the current
device in the chain with MATCH_ROM. Also acknowledgment was
read twice.
Signed-off-by: Lucas Denefle <lucas.denefle@converge.io>
Link: https://lore.kernel.org/r/20220223113558.232750-1-lucas.denefle@converge.io
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 3c350dfbcd0b..aba727294bc8 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -693,16 +693,20 @@ static ssize_t w1_seq_show(struct device *device, if (sl->reg_num.id == reg_num->id) seq = i; + if (w1_reset_bus(sl->master)) + goto error; + + /* Put the device into chain DONE state */ + w1_write_8(sl->master, W1_MATCH_ROM); + w1_write_block(sl->master, (u8 *)&rn, 8); w1_write_8(sl->master, W1_42_CHAIN); w1_write_8(sl->master, W1_42_CHAIN_DONE); w1_write_8(sl->master, W1_42_CHAIN_DONE_INV); - w1_read_block(sl->master, &ack, sizeof(ack)); /* check for acknowledgment */ ack = w1_read_8(sl->master); if (ack != W1_42_SUCCESS_CONFIRM_BYTE) goto error; - } /* Exit from CHAIN state */ |