Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd58037 authored Apr 10, 2018 by Arnaud Pouliquen Committed by Bjorn Andersson Apr 25, 2018

remoteproc: fix crashed parameter logic on stop call



Fix rproc_add_subdev parameter name and inverse the crashed logic.

Fixes: 880f5b38 ("remoteproc: Pass type of shutdown to subdev remove")
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

parent 60cc43fc

drivers/remoteproc/remoteproc_core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1163,7 +1163,7 @@ int rproc_trigger_recovery(struct rproc *rproc)
	if (ret)		if (ret)
	return ret;		return ret;

	ret = rproc_stop(rproc, false);		ret = rproc_stop(rproc, true);
	if (ret)		if (ret)
	goto unlock_mutex;		goto unlock_mutex;

	@@ -1316,7 +1316,7 @@ void rproc_shutdown(struct rproc *rproc)
	if (!atomic_dec_and_test(&rproc->power))		if (!atomic_dec_and_test(&rproc->power))
	goto out;		goto out;

	ret = rproc_stop(rproc, true);		ret = rproc_stop(rproc, false);
	if (ret) {		if (ret) {
	atomic_inc(&rproc->power);		atomic_inc(&rproc->power);
	goto out;		goto out;

include/linux/remoteproc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,7 @@ static inline struct rproc vdev_to_rproc(struct virtio_device vdev)
	void rproc_add_subdev(struct rproc *rproc,		void rproc_add_subdev(struct rproc *rproc,
	struct rproc_subdev *subdev,		struct rproc_subdev *subdev,
	int (probe)(struct rproc_subdev subdev),		int (probe)(struct rproc_subdev subdev),
	void (remove)(struct rproc_subdev subdev, bool graceful));		void (remove)(struct rproc_subdev subdev, bool crashed));

	void rproc_remove_subdev(struct rproc rproc, struct rproc_subdev subdev);		void rproc_remove_subdev(struct rproc rproc, struct rproc_subdev subdev);