[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1401733922-5943-1-git-send-email-jaswinder.singh@linaro.org>
Date: Tue, 3 Jun 2014 00:02:02 +0530
From: Jassi Brar <jaswinder.singh@...aro.org>
To: linux-kernel@...r.kernel.org
Cc: gregkh@...uxfoundation.org, s-anna@...com, loic.pallardy@...com,
lftan.linux@...il.com, slapdau@...oo.com.au,
courtney.cavin@...ymobile.com, robherring2@...il.com,
arnd@...db.de, joshc@...eaurora.org, linus.walleij@...aro.org,
galak@...eaurora.org, ks.giri@...sung.com, patches@...aro.org,
bjorn@...o.se, Jassi Brar <jaswinder.singh@...aro.org>
Subject: [PATCHv6 3/3] mailbox: Fix deleteing poll timer
From: LeyFoon Tan <lftan.linux@...il.com>
Try to delete the timer only if it was init/used.
Signed-off-by: LeyFoon Tan <lftan.linux@...il.com>
Signed-off-by: Jassi Brar <jaswinder.singh@...aro.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 336fa10..ae4abd9 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);
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists