[PATCH 1/5] memory: renesas-rpc-if: Return correct value to the caller of rpcif_manual_xfer()

* [PATCH 1/5] memory: renesas-rpc-if: Return correct value to the caller of rpcif_manual_xfer()
       [not found] <20201124112552.26377-1-prabhakar.mahadev-lad.rj@bp.renesas.com>
@ 2020-11-24 11:25 ` Lad Prabhakar
  2020-11-25  8:48   ` Sergei Shtylyov
  2020-11-24 11:25 ` [PATCH 5/5] memory: renesas-rpc-if: Fix a reference leak in rpcif_probe() Lad Prabhakar
  1 sibling, 1 reply; 4+ messages in thread
From: Lad Prabhakar @ 2020-11-24 11:25 UTC (permalink / raw)
  To: Sergei Shtylyov, Krzysztof Kozlowski, Philipp Zabel, Jiri Kosina,
	Mark Brown
  Cc: linux-kernel, linux-renesas-soc, Biju Das, Prabhakar,
	Lad Prabhakar, stable

In the error path of rpcif_manual_xfer() the value of ret is overwritten
by value returned by reset_control_reset() function and thus returning
incorrect value to the caller.

This patch makes sure the correct value is returned to the caller of
rpcif_manual_xfer() by dropping the overwrite of ret in error path.
Also now we ignore the value returned by reset_control_reset() in the
error path and instead print a error message when it fails.

Fixes: ca7d8b980b67f ("memory: add Renesas RPC-IF driver")
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Cc: stable@vger.kernel.org
---
 drivers/memory/renesas-rpc-if.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index f2a33a1af836..69f2e2b4cd50 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -508,7 +508,8 @@ int rpcif_manual_xfer(struct rpcif *rpc)
 	return ret;
 
 err_out:
-	ret = reset_control_reset(rpc->rstc);
+	if (reset_control_reset(rpc->rstc))
+		dev_err(rpc->dev, "Failed to reset HW\n");
 	rpcif_hw_init(rpc, rpc->bus_size == 2);
 	goto exit;
 }
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread