From: Jassi Brar <jaswinder.singh@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org, mporter@linaro.org,
patches@linaro.org, bjorn@kryo.se, ashwin.chaugule@linaro.org,
gregkh@linuxfoundation.org, s-anna@ti.com, loic.pallardy@st.com,
lftan.linux@gmail.com, slapdau@yahoo.com.au,
courtney.cavin@sonymobile.com, pawel.moll@arm.com,
robh+dt@kernel.org, mark.rutland@arm.com,
ijc+devicetree@hellion.org.uk, arnd@arndb.de,
joshc@codeaurora.org, linus.walleij@linaro.org,
galak@codeaurora.org, ks.giri@samsung.com,
Jassi Brar <jaswinder.singh@linaro.org>
Subject: [PATCHv7 4/5] mailbox: Fix deleteing poll timer
Date: Thu, 12 Jun 2014 22:32:22 +0530 [thread overview]
Message-ID: <1402592542-7318-1-git-send-email-jaswinder.singh@linaro.org> (raw)
In-Reply-To: <1402592317-7043-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 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
next prev parent reply other threads:[~2014-06-12 17:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 16:58 [PATCHv7 0/5] Common Mailbox Framework Jassi Brar
2014-06-12 17:00 ` [PATCHv7 1/5] mailbox: rename pl320-ipc specific mailbox.h Jassi Brar
2014-06-12 17:01 ` [PATCHv7 2/5] mailbox: Introduce framework for mailbox Jassi Brar
2014-06-13 20:40 ` Mark Brown
2014-06-18 0:27 ` Kevin Hilman
2014-06-18 8:33 ` Jassi Brar
2014-06-18 17:03 ` Kevin Hilman
2014-06-19 2:55 ` Jassi Brar
2014-06-19 12:14 ` Ashwin Chaugule
2014-06-19 12:36 ` Sudeep Holla
2014-06-19 18:17 ` Sudeep Holla
[not found] ` <20140619190342.GT4173@beef>
2014-06-19 20:29 ` Jassi Brar
2014-06-19 20:40 ` Matt Porter
2014-06-20 18:05 ` Lubomir Rintel
2014-06-22 10:56 ` Lubomir Rintel
2014-06-12 17:01 ` [PATCHv7 3/5] Mailbox: Generic: Specify mailbox api bindings Jassi Brar
2014-06-12 17:02 ` Jassi Brar [this message]
2014-06-12 17:02 ` [PATCHv7 5/5] MAINTAINERS: Add maintainer entry for Mailbox API Jassi Brar
2014-06-30 16:16 ` [PATCHv7 0/5] Common Mailbox Framework Lubomir Rintel
2014-06-30 16:22 ` Jassi Brar
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=1402592542-7318-1-git-send-email-jaswinder.singh@linaro.org \
--to=jaswinder.singh@linaro.org \
--cc=arnd@arndb.de \
--cc=ashwin.chaugule@linaro.org \
--cc=bjorn@kryo.se \
--cc=courtney.cavin@sonymobile.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--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=mark.rutland@arm.com \
--cc=mporter@linaro.org \
--cc=patches@linaro.org \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--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).