diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2017-03-21 11:30:16 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-06 19:19:41 -0700 |
| commit | 63c9c49c04a174b5cb05814ea3883afb6454f0d7 (patch) | |
| tree | b00ba8ea4907a7d50f339595c9b81b56a69250f2 /drivers | |
| parent | 21ab579fbae675905fccfd08386663b561a7ff41 (diff) | |
| download | linux-stable-63c9c49c04a174b5cb05814ea3883afb6454f0d7.tar.gz linux-stable-63c9c49c04a174b5cb05814ea3883afb6454f0d7.tar.bz2 linux-stable-63c9c49c04a174b5cb05814ea3883afb6454f0d7.zip | |
mailbox: handle empty message in tx_tick
commit cb710ab1d8a23f68ff8f45aedf3e552bb90e70de upstream.
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")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mailbox/mailbox.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 233af2ce9b8c..9cf826df89b1 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -104,8 +104,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) |