1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 252a58698ef7..77c23f5a0037 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -299,6 +299,8 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
 static void omap_mbox_fini(struct omap_mbox *mbox)
 {
         free_irq(mbox->irq, mbox);
+        tasklet_kill(&mbox->txq->tasklet);
+        flush_work(&mbox->rxq->work);
         mbox_queue_free(mbox->txq);
         mbox_queue_free(mbox->rxq);