projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mailbox
/
mailbox.c
diff --git
a/drivers/mailbox/mailbox.c
b/drivers/mailbox/mailbox.c
index 9a937ef350680752eb4c5b4a70dfccd7d27d2f9f..afcb430508eceac7887ee436ec19c15fcfad89cd 100644
(file)
--- 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 +
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);
msg_submit(chan);
- INIT_COMPLETION(chan->tx_complete);
-
if (chan->txdone_method == TXDONE_BY_POLL)
poll_txdone((unsigned long)chan->mbox);
if (chan->txdone_method == TXDONE_BY_POLL)
poll_txdone((unsigned long)chan->mbox);