diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-08 12:58:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-08 12:58:12 -0700 |
| commit | d26a42a9614083413e778832a6efbdf0038c3bff (patch) | |
| tree | 3c9b63e8a23cca71849d2efb90a6a900bd21889e /drivers/rpmsg | |
| parent | 95288a9b3beee8dd69d73b7691e36f2f231b7903 (diff) | |
| parent | 4f05fc33bebdc7d69259c412dd21d09751827dbd (diff) | |
Merge tag 'rpmsg-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"This replaces a zero-length array with flexible-array and fixes a typo
in a comment in the rpmsg core"
* tag 'rpmsg-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
rpmsg: Replace zero-length array with flexible-array
rpmsg: fix a comment typo for rpmsg_device_match()
Diffstat (limited to 'drivers/rpmsg')
| -rw-r--r-- | drivers/rpmsg/rpmsg_core.c | 2 | ||||
| -rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index e330ec4dfc33..a6361cad608b 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -284,7 +284,7 @@ int rpmsg_trysend_offchannel(struct rpmsg_endpoint *ept, u32 src, u32 dst, EXPORT_SYMBOL(rpmsg_trysend_offchannel); /* - * match an rpmsg channel with a channel info struct. + * match a rpmsg channel with a channel info struct. * this is used to make sure we're not creating rpmsg devices for channels * that already exist. */ diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 376ebbf880d6..07d4f3374098 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -89,7 +89,7 @@ struct rpmsg_hdr { u32 reserved; u16 len; u16 flags; - u8 data[0]; + u8 data[]; } __packed; /** |