diff options
author | Arnaud Pouliquen <arnaud.pouliquen@st.com> | 2018-04-10 04:57:25 -0400 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-04-25 19:43:55 -0400 |
commit | fcd58037f28bf70eb17157a51fbf94d466634a7d (patch) | |
tree | 07e1619f9de64b4be5273b279561a4bce1dfe6c7 | |
parent | 60cc43fc888428bb2f18f08997432d426a243338 (diff) |
remoteproc: fix crashed parameter logic on stop call
Fix rproc_add_subdev parameter name and inverse the crashed logic.
Fixes: 880f5b388252 ("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>
-rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 4 | ||||
-rw-r--r-- | include/linux/remoteproc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 6d9c5832ce47..a9609d971f7f 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c | |||
@@ -1163,7 +1163,7 @@ int rproc_trigger_recovery(struct rproc *rproc) | |||
1163 | if (ret) | 1163 | if (ret) |
1164 | return ret; | 1164 | return ret; |
1165 | 1165 | ||
1166 | ret = rproc_stop(rproc, false); | 1166 | ret = rproc_stop(rproc, true); |
1167 | if (ret) | 1167 | if (ret) |
1168 | goto unlock_mutex; | 1168 | goto unlock_mutex; |
1169 | 1169 | ||
@@ -1316,7 +1316,7 @@ void rproc_shutdown(struct rproc *rproc) | |||
1316 | if (!atomic_dec_and_test(&rproc->power)) | 1316 | if (!atomic_dec_and_test(&rproc->power)) |
1317 | goto out; | 1317 | goto out; |
1318 | 1318 | ||
1319 | ret = rproc_stop(rproc, true); | 1319 | ret = rproc_stop(rproc, false); |
1320 | if (ret) { | 1320 | if (ret) { |
1321 | atomic_inc(&rproc->power); | 1321 | atomic_inc(&rproc->power); |
1322 | goto out; | 1322 | goto out; |
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index d09a9c7af109..dfdaede9139e 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h | |||
@@ -569,7 +569,7 @@ static inline struct rproc *vdev_to_rproc(struct virtio_device *vdev) | |||
569 | void rproc_add_subdev(struct rproc *rproc, | 569 | void rproc_add_subdev(struct rproc *rproc, |
570 | struct rproc_subdev *subdev, | 570 | struct rproc_subdev *subdev, |
571 | int (*probe)(struct rproc_subdev *subdev), | 571 | int (*probe)(struct rproc_subdev *subdev), |
572 | void (*remove)(struct rproc_subdev *subdev, bool graceful)); | 572 | void (*remove)(struct rproc_subdev *subdev, bool crashed)); |
573 | 573 | ||
574 | void rproc_remove_subdev(struct rproc *rproc, struct rproc_subdev *subdev); | 574 | void rproc_remove_subdev(struct rproc *rproc, struct rproc_subdev *subdev); |
575 | 575 | ||