From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, Jassi Brar <jaswinder.singh@linaro.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Alexey Klimov <alexey.klimov@arm.com>,
Jassi Brar <jassisinghbrar@gmail.com>
Subject: [PATCH 3/3] mailbox: handle empty message in tx_tick
Date: Tue, 21 Mar 2017 11:30:16 +0000 [thread overview]
Message-ID: <1490095816-10943-3-git-send-email-sudeep.holla@arm.com> (raw)
In-Reply-To: <1490095816-10943-1-git-send-email-sudeep.holla@arm.com>
We already check if the message is empty before calling the client
tx_done callback. Calling completion on a wait event is also invalid
if the message is empty.
This patch moves the existing empty message check earlier.
Fixes: 2b6d83e2b8b7 ("mailbox: Introduce framework for mailbox")
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/mailbox/mailbox.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 2ed7fa681ecb..5ef014241212 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -103,8 +103,11 @@ static void tx_tick(struct mbox_chan *chan, int r)
/* Submit next message */
msg_submit(chan);
+ if (!mssg)
+ return;
+
/* Notify the client */
- if (mssg && chan->cl->tx_done)
+ if (chan->cl->tx_done)
chan->cl->tx_done(chan->cl, mssg, r);
if (r != -ETIME && chan->cl->tx_block)
--
2.7.4
next prev parent reply other threads:[~2017-03-21 11:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 11:30 [PATCH 1/3] mailbox: always wait in mbox_send_message for blocking Tx mode Sudeep Holla
2017-03-21 11:30 ` [PATCH 2/3] mailbox: skip complete wait event if timer expired Sudeep Holla
2017-03-21 11:30 ` Sudeep Holla [this message]
2017-03-28 18:20 ` [PATCH 1/3] mailbox: always wait in mbox_send_message for blocking Tx mode Jassi Brar
2017-03-29 11:34 ` Sudeep Holla
2017-03-29 17:46 ` Jassi Brar
2017-04-11 13:00 ` Alexey Klimov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490095816-10943-3-git-send-email-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=alexey.klimov@arm.com \
--cc=jassisinghbrar@gmail.com \
--cc=jaswinder.singh@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®