Skip to content

Commit 643af93

Browse files
committed
Merge tag 'rpmsg-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson: - fix interrupt handling in the stm32 remoteproc driver when being attached to an already running remote processor - fix invalid kernel-doc and add missing MODULE_DESCRIPTION() in the rpmsg char driver * tag 'rpmsg-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: rpmsg: char: add missing MODULE_DESCRIPTION() macro remoteproc: stm32_rproc: Fix mailbox interrupts queuing rpmsg: char: Fix rpmsg_eptdev structure documentation
2 parents 60c6119 + 36862ea commit 643af93

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/remoteproc/stm32_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static void stm32_rproc_mb_vq_work(struct work_struct *work)
294294

295295
mutex_lock(&rproc->lock);
296296

297-
if (rproc->state != RPROC_RUNNING)
297+
if (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED)
298298
goto unlock_mutex;
299299

300300
if (rproc_vq_interrupt(rproc, mb->vq_id) == IRQ_NONE)

drivers/rpmsg/rpmsg_char.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ static DEFINE_IDA(rpmsg_minor_ida);
5252
* @readq: wait object for incoming queue
5353
* @default_ept: set to channel default endpoint if the default endpoint should be re-used
5454
* on device open to prevent endpoint address update.
55-
* remote_flow_restricted: to indicate if the remote has requested for flow to be limited
56-
* remote_flow_updated: to indicate if the flow control has been requested
55+
* @remote_flow_restricted: to indicate if the remote has requested for flow to be limited
56+
* @remote_flow_updated: to indicate if the flow control has been requested
5757
*/
5858
struct rpmsg_eptdev {
5959
struct device dev;
@@ -566,4 +566,5 @@ static void rpmsg_chrdev_exit(void)
566566
module_exit(rpmsg_chrdev_exit);
567567

568568
MODULE_ALIAS("rpmsg:rpmsg_chrdev");
569+
MODULE_DESCRIPTION("RPMSG device interface");
569570
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)