| From 676283b7ba99b617fbb84f29787a203e31304c12 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 May 2021 22:46:01 +0200 |
| Subject: remoteproc: k3-r5: Fix an error message |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 34c4da6d5dfba48f49f891ebd75bb55999f0c538 ] |
| |
| 'ret' is known to be 0 here. |
| Reorder the code so that the expected error code is printed. |
| |
| Acked-by: Suman Anna <s-anna@ti.com> |
| Fixes: 6dedbd1d5443 ("remoteproc: k3-r5: Add a remoteproc driver for R5F subsystem") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Link: https://lore.kernel.org/r/d6e29d903b48957bf59c67229d54b0fc215e31ae.1620333870.git.christophe.jaillet@wanadoo.fr |
| Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c |
| index 62b5a4c29456..914db1d1f638 100644 |
| --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c |
| +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c |
| @@ -1272,9 +1272,9 @@ static int k3_r5_core_of_init(struct platform_device *pdev) |
| |
| core->tsp = k3_r5_core_of_get_tsp(dev, core->ti_sci); |
| if (IS_ERR(core->tsp)) { |
| + ret = PTR_ERR(core->tsp); |
| dev_err(dev, "failed to construct ti-sci proc control, ret = %d\n", |
| ret); |
| - ret = PTR_ERR(core->tsp); |
| goto err; |
| } |
| |
| -- |
| 2.30.2 |
| |
