diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-05 10:05:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-05 10:05:40 -0800 |
| commit | 67fb3b92b0f92a161e25370d437ae4ba08089e75 (patch) | |
| tree | b48d6720d4af5e0282af9d1ecb404909515c7fc5 /drivers/remoteproc | |
| parent | ae77c9583f424d8af0caf635a83dd0c267cb1052 (diff) | |
| parent | c3388a075c8ac568f892c40bec919ba8ac4077f0 (diff) | |
Merge tag 'rpmsg-v4.16' of git://github.com/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"This fixes a few issues found in the SMD and GLINK drivers and
corrects the handling of SMD channels that are found in an
(previously) unexpected state"
* tag 'rpmsg-v4.16' of git://github.com/andersson/remoteproc:
rpmsg: smd: Fix double unlock in __qcom_smd_send()
rpmsg: glink: Fix missing mutex_init() in qcom_glink_alloc_channel()
rpmsg: smd: Don't hold the tx lock during wait
rpmsg: smd: Fail send on a closed channel
rpmsg: smd: Wake up all waiters
rpmsg: smd: Create device for all channels
rpmsg: smd: Perform handshake during open
rpmsg: glink: smem: Ensure ordering during tx
drivers: rpmsg: remove duplicate includes
remoteproc: qcom: Use PTR_ERR_OR_ZERO() in glink prob
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c index d487040b528b..e9b5f2a98c4d 100644 --- a/drivers/remoteproc/qcom_common.c +++ b/drivers/remoteproc/qcom_common.c @@ -57,7 +57,7 @@ static int glink_subdev_probe(struct rproc_subdev *subdev) glink->edge = qcom_glink_smem_register(glink->dev, glink->node); - return IS_ERR(glink->edge) ? PTR_ERR(glink->edge) : 0; + return PTR_ERR_OR_ZERO(glink->edge); } static void glink_subdev_remove(struct rproc_subdev *subdev) |