diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 21:07:43 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 21:07:43 -1000 |
| commit | f93314732fd9263621c86b05dad8b75cf838bc62 (patch) | |
| tree | a7d0cb2e5d5a12aa44a0c32740d999ad328f584b /include | |
| parent | c12fd0fe0c222e1e69cbbc41234ec525ee9b091b (diff) | |
| parent | 93dd4e73c0d9cc32f835d76a54257020b0bfc75a (diff) | |
| download | linux-f93314732fd9263621c86b05dad8b75cf838bc62.tar.bz2 | |
Merge tag 'rproc-v4.17-1' of git://github.com/andersson/remoteproc
Pull remoteproc and rpmsg fixes from Bjorn Andersson:
- fix screw-up when reversing boolean for rproc_stop()
- add missing OF node refcounting dereferences
- add missing MODULE_ALIAS in rpmsg_char
* tag 'rproc-v4.17-1' of git://github.com/andersson/remoteproc:
rpmsg: added MODULE_ALIAS for rpmsg_char
remoteproc: qcom: Fix potential device node leaks
remoteproc: fix crashed parameter logic on stop call
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/remoteproc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) void rproc_add_subdev(struct rproc *rproc, 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); |