remoteproc: Reset table_ptr in rproc_start() failure paths

Unwind the modified table_ptr and restore it to the local copy
upon any subsequent failures in the rproc_start() function. This
keeps the function to remain balanced on failures without the need
to balance any modified variables elsewhere.

While at this, do some minor cleanup of the extra lines between
the failure labels as well.

Signed-off-by: Suman Anna <s-anna@ti.com>
[bjorn: unconditionally set table_ptr to cached_table]
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 283b258f5e0f5e50545886bbbd5eb01f7546748d..38a5e98d7dd73cdd0486828cd255f04c60dd61ba 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -940,7 +940,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
        if (ret) {
                dev_err(dev, "failed to prepare subdevices for %s: %d\n",
                        rproc->name, ret);
-               return ret;
+               goto reset_table_ptr;
        }
 
        /* power up the remote processor */
@@ -966,9 +966,10 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
 
 stop_rproc:
        rproc->ops->stop(rproc);
-
 unprepare_subdevices:
        rproc_unprepare_subdevices(rproc);
+reset_table_ptr:
+       rproc->table_ptr = rproc->cached_table;
 
        return ret;
 }