diff options
| author | LeyFoon Tan <lftan.linux@gmail.com> | 2014-06-12 22:32:22 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-13 21:50:24 +0100 |
| commit | 7e8a356e6c2d32cf8b0111be5a83089201c75c83 (patch) | |
| tree | 77c70b8a8994e2ffba7d2fffac5ee9e0bea39fd0 | |
| parent | cc2e5bd705fe3beabb50180f5b1e3db005e3e569 (diff) | |
mailbox: Fix deleteing poll timer
Try to delete the timer only if it was init/used.
Signed-off-by: LeyFoon Tan <lftan.linux@gmail.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/mailbox/mailbox.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 9d356ba77edf..e1fc6aaeb87c 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -480,7 +480,8 @@ void mbox_controller_unregister(struct mbox_controller *mbox) for (i = 0; i < mbox->num_chans; i++) mbox_free_channel(&mbox->chans[i]); - del_timer_sync(&mbox->poll); + if (mbox->txdone_poll) + del_timer_sync(&mbox->poll); mutex_unlock(&con_mutex); } |