diff mbox series

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

Message ID b2c2192b461fbb9b8e9bea4ad514a49557a7210b.1590255176.git.hns@goldelico.com (mailing list archive)
State New, archived
Headers show
Series w1: omap: fix some regressions/bugs (some were introduced in v5.6 but some are older) | expand

Commit Message

H. Nikolaus Schaller May 23, 2020, 5:32 p.m. UTC 
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: stable@vger.kernel.org # v5.6+
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/w1/masters/omap_hdq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren May 23, 2020, 6:11 p.m. UTC | #1 
* H. Nikolaus Schaller <hns@goldelico.com> [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 <tony@atomide.com>
diff mbox series

Patch

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, &val);
 	if (ret)
-		ret = -1;
+		val = -1;
 
 	pm_runtime_mark_last_busy(hdq_data->dev);
 	pm_runtime_put_autosuspend(hdq_data->dev);