summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-08-09 11:37:15 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-08-09 11:37:15 +1000
commit84c6b87f4bfae6a6c39d06d5293bf8a9d681ae0c (patch)
treed502de1a74b00e76606c11172f6d4c5a10e78a50
parent07fc2705a416f33d18f556463d9d2cb9744024a4 (diff)
parente937b335a738c1d13cd0ff8466c3ff2b8d5da8ac (diff)
downloadlinux-next-84c6b87f4bfae6a6c39d06d5293bf8a9d681ae0c.tar.gz
Merge remote-tracking branch 'rpmsg/for-next'
-rw-r--r--drivers/rpmsg/virtio_rpmsg_bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index fe03b2aef450..e58637aa6b2c 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -528,7 +528,7 @@ static struct rpmsg_channel *rpmsg_create_channel(struct virtproc_info *vrp,
* rpmsg server channels has predefined local address (for now),
* and their existence needs to be announced remotely
*/
- rpdev->announce = rpdev->src != RPMSG_ADDR_ANY ? true : false;
+ rpdev->announce = rpdev->src != RPMSG_ADDR_ANY;
strncpy(rpdev->id.name, chinfo->name, RPMSG_NAME_SIZE);