Commit f68d51bd authored Jul 26, 2018 by Suman Anna Committed by Bjorn Andersson Jul 30, 2018

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>

parent 7cbb540a

drivers/remoteproc/remoteproc_core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}