diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 23:43:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 23:43:29 +0000 |
| commit | 50881c752b92d9750ea0e3c49a504d9fe732e999 (patch) | |
| tree | b98cbd45d5381d0182527a507861fbaafb570bc2 /drivers | |
| parent | 09cc926e9a6002790e69ed213217ef9874888624 (diff) | |
| parent | c583b1fec06304d6128f02b1bffff27202c66abf (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsklsk-v3.10-14.11
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mailbox/mailbox.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 9a937ef35068..afcb430508ec 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -126,7 +126,7 @@ static void poll_txdone(unsigned long data) if (resched) mod_timer(&mbox->poll, jiffies + - msecs_to_jiffies(mbox->period)); + msecs_to_jiffies(mbox->txpoll_period)); } /** @@ -252,8 +252,6 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) msg_submit(chan); - INIT_COMPLETION(chan->tx_complete); - if (chan->txdone_method == TXDONE_BY_POLL) poll_txdone((unsigned long)chan->mbox); |