Commit a0453f4e authored Nov 26, 2020 by Lad Prabhakar Committed by Krzysztof Kozlowski Nov 28, 2020

memory: renesas-rpc-if: Return correct value to the caller of rpcif_manual_xfer()



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: ca7d8b98 ("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>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Pavel Machek (CIP) <pavel@denx.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20201126191146.8753-2-prabhakar.mahadev-lad.rj@bp.renesas.com


Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

parent 5445a0c0

drivers/memory/renesas-rpc-if.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,8 @@ exit:
		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;
		}

Admin message