Re: [PATCH 2/4] w1: omap-hdq: fix return value to be -1 if there is a timeout

2020-05-23 Thread Tony Lindgren
* H. Nikolaus Schaller  [200523 17:34]:
> The code accidentially overwrites the variable ret and not val,
> which is returned. So it will return the initial value 0 instead
> of -1.

Oops, sorry about causing this. And thanks for catching it:

Acked-by: Tony Lindgren 


[PATCH 2/4] w1: omap-hdq: fix return value to be -1 if there is a timeout

2020-05-23 Thread H. Nikolaus Schaller
omap_w1_read_byte() should return -1 (or 0xff) in case of
error (e.g. missing battery).

The code accidentially overwrites the variable ret and not val,
which is returned. So it will return the initial value 0 instead
of -1.

Fixes: 27d13da8782a ("w1: omap-hdq: Simplify driver with PM runtime 
autosuspend")
Cc: sta...@vger.kernel.org # v5.6+
Signed-off-by: H. Nikolaus Schaller 
---
 drivers/w1/masters/omap_hdq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index d363e2a89fdfc4..9f9ec108b189e2 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -464,7 +464,7 @@ static u8 omap_w1_read_byte(void *_hdq)
 
ret = hdq_read_byte(hdq_data, );
if (ret)
-   ret = -1;
+   val = -1;
 
pm_runtime_mark_last_busy(hdq_data->dev);
pm_runtime_put_autosuspend(hdq_data->dev);
-- 
2.26.2