Commit f68d51bd authored by Suman Anna's avatar Suman Anna Committed by Bjorn Andersson

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: default avatarSuman Anna <s-anna@ti.com>
[bjorn: unconditionally set table_ptr to cached_table]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 7cbb540a
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment