aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-22 13:32:20 -0500
committerMark Brown <broonie@linaro.org>2014-08-22 13:32:20 -0500
commitc2548e22dd3bbc416ed2a5aad349c98d010643b7 (patch)
treeae205f80369693e259db2f9780d3a608836e1bb8
parent9c0602d9e2b313761bdce4ecdeb5eb5fd2995aea (diff)
parent586197edd648635f892870b1c4f726496a8dcb6c (diff)
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.08
-rw-r--r--drivers/mailbox/mailbox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 9a937ef35068..63ecc1723466 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -252,7 +252,7 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
msg_submit(chan);
- INIT_COMPLETION(chan->tx_complete);
+ reinit_completion(&chan->tx_complete);
if (chan->txdone_method == TXDONE_BY_POLL)
poll_txdone((unsigned long)chan->mbox);