From: Jassi Brar <jassisinghbrar@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, s-anna@ti.com, loic.pallardy@st.com,
lftan.linux@gmail.com, slapdau@yahoo.com.au,
courtney.cavin@sonymobile.com, robherring2@gmail.com,
arnd@arndb.de, joshc@codeaurora.org, linus.walleij@linaro.org,
galak@codeaurora.org, ks.giri@samsung.com,
Jassi Brar <jaswinder.singh@linaro.org>
Subject: [PATCHv5 4/4] mailbox: Fix deleteing poll timer
Date: Thu, 15 May 2014 11:42:22 +0530 [thread overview]
Message-ID: <1400134342-4058-1-git-send-email-jaswinder.singh@linaro.org> (raw)
In-Reply-To: <1400134105-3847-1-git-send-email-jaswinder.singh@linaro.org>
From: LeyFoon Tan <lftan.linux@gmail.com>
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>
---
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 befb256..d83d12c 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -475,7 +475,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
prev parent reply other threads:[~2014-05-15 6:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 6:08 [PATCHv5 0/4] Common Mailbox Framework Jassi Brar
2014-05-15 6:10 ` [PATCHv5 1/4] mailbox: rename pl320-ipc specific mailbox.h Jassi Brar
2014-05-15 6:11 ` [PATCHv5 2/4] mailbox: Introduce framework for mailbox Jassi Brar
2014-05-15 14:27 ` Arnd Bergmann
2014-05-16 13:33 ` Jassi Brar
2014-05-19 13:08 ` Arnd Bergmann
2014-05-19 18:03 ` Jassi Brar
2014-05-19 19:55 ` Bjorn Andersson
2014-05-19 20:01 ` Arnd Bergmann
2014-05-20 18:11 ` Jassi Brar
2014-05-29 15:43 ` Matt Porter
2014-05-30 5:31 ` Jassi Brar
2014-06-02 15:14 ` Matt Porter
2014-06-02 17:11 ` Jassi Brar
2014-06-02 22:04 ` Matt Porter
2014-06-03 9:35 ` Sudeep Holla
2014-06-03 10:21 ` Jassi Brar
2014-06-03 15:06 ` Sudeep Holla
2014-06-05 11:12 ` Matt Porter
2014-06-05 11:39 ` Jassi Brar
2014-06-11 16:07 ` Mark Brown
2014-05-21 17:27 ` Mark Brown
2014-05-21 18:14 ` Arnd Bergmann
2014-05-28 4:20 ` Jassi Brar
2014-05-28 15:50 ` Suman Anna
2014-06-11 15:37 ` Mark Brown
2014-05-15 6:11 ` [PATCHv5 3/4] mailbox: Fix TX completion init Jassi Brar
2014-05-15 6:12 ` Jassi Brar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400134342-4058-1-git-send-email-jaswinder.singh@linaro.org \
--to=jassisinghbrar@gmail.com \
--cc=arnd@arndb.de \
--cc=courtney.cavin@sonymobile.com \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=jaswinder.singh@linaro.org \
--cc=joshc@codeaurora.org \
--cc=ks.giri@samsung.com \
--cc=lftan.linux@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.pallardy@st.com \
--cc=robherring2@gmail.com \
--cc=s-anna@ti.com \
--cc=slapdau@yahoo.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).