diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:31:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:31:11 -0700 |
| commit | 7636b7589f81940c6d6518786f93de74495575fa (patch) | |
| tree | 329d3fd18616774a4b281beff0c8ce305209b726 /drivers | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | rpmsg: core: Make remove handler for rpmsg driver optional. (diff) | |
| download | linux-dev-7636b7589f81940c6d6518786f93de74495575fa.tar.xz linux-dev-7636b7589f81940c6d6518786f93de74495575fa.zip | |
Merge tag 'rpmsg-v5.3' of git://github.com/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"This contains a DT binding update and a change to make the remote
function of rpmsg_devices optional"
* tag 'rpmsg-v5.3' of git://github.com/andersson/remoteproc:
rpmsg: core: Make remove handler for rpmsg driver optional.
dt-bindings: soc: qcom: Add remote-pid binding for GLINK SMEM
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rpmsg/rpmsg_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index 8122807db380..ea88fd4e2a6e 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -493,7 +493,8 @@ static int rpmsg_dev_remove(struct device *dev) if (rpdev->ops->announce_destroy) err = rpdev->ops->announce_destroy(rpdev); - rpdrv->remove(rpdev); + if (rpdrv->remove) + rpdrv->remove(rpdev); dev_pm_domain_detach(dev, true); |