2019-09-19 14:43:19 +00:00
|
|
|
From f74fe07cab3e8816c029de25029b71c80004619c Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Mariusz Bialonczyk <manio@skyboo.net>
|
|
|
|
|
Date: Thu, 16 May 2019 14:39:21 +0200
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] w1: ds2408: Fix typo after 49695ac46861 (reset on
|
2019-07-09 18:32:28 +00:00
|
|
|
output_write retry with readback)
|
|
|
|
|
|
|
|
|
|
commit 6660a04feb7ef648e50c792e19084d675fa6f3a2 upstream.
|
|
|
|
|
|
|
|
|
|
Fix a typo in commit:
|
|
|
|
|
49695ac46861 w1: ds2408: reset on output_write retry with readback
|
|
|
|
|
|
|
|
|
|
Fixes: 49695ac46861 ("w1: ds2408: reset on output_write retry with readback")
|
|
|
|
|
Reported-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Cc: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
|
|
|
|
|
Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net>
|
|
|
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/w1/slaves/w1_ds2408.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/w1/slaves/w1_ds2408.c
|
|
|
|
|
+++ b/drivers/w1/slaves/w1_ds2408.c
|
|
|
|
|
@@ -138,7 +138,7 @@ static ssize_t status_control_read(struc
|
|
|
|
|
W1_F29_REG_CONTROL_AND_STATUS, buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#ifdef fCONFIG_W1_SLAVE_DS2408_READBACK
|
|
|
|
|
+#ifdef CONFIG_W1_SLAVE_DS2408_READBACK
|
|
|
|
|
static bool optional_read_back_valid(struct w1_slave *sl, u8 expected)
|
|
|
|
|
{
|
|
|
|
|
u8 w1_buf[3];
|
