From: LeyFoon Tan <lftan.li...@gmail.com>
Try to delete the timer only if it was init/used.
Signed-off-by: LeyFoon Tan <lftan.li...@gmail.com>
Signed-off-by: Jassi Brar <jaswinder.si...@linaro.org>
---
drivers/mailbox/mailbox.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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);
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
