From: LeyFoon Tan <lftan.linux@gmail.com>
Date: Tue, 18 Mar 2014 18:46:39 +0000 (+0530)
Subject: mailbox: Fix deleteing poll timer
X-Git-Tag: accepted/tizen/common/20141203.182822~94^2~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d185fe31ddd64f275a3009c62846d6f3958bab5c;p=platform%2Fkernel%2Flinux-arm64.git

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>
---

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index cdf7d45..d080fc3 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -584,7 +584,8 @@ void mbox_controller_unregister(struct mbox_controller *mbox)
 	list_for_each_entry(chan, &con->channels, node)
 		mbox_free_channel(chan);
 
-	del_timer_sync(&con->poll);
+	if (mbox->txdone_poll)
+		del_timer_sync(&con->poll);
 
 	kfree(con);
 }