From: Brian Norris <briannorris@chromium.org>
To: Jeffy Chen <jeffy.chen@rock-chips.com>
Cc: linux-bluetooth@vger.kernel.org,
Amitkumar Karwar <akarwar@marvell.com>,
Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Gustavo Padovan <gustavo@padovan.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] btmrvl: avoid double-disable_irq() race
Date: Fri, 20 Jan 2017 11:29:17 -0800 [thread overview]
Message-ID: <20170120192916.GC84521@google.com> (raw)
In-Reply-To: <1484910860-7690-1-git-send-email-jeffy.chen@rock-chips.com>
On Fri, Jan 20, 2017 at 07:14:18PM +0800, Jeffy Chen wrote:
> It's much the same as what we did for mwifiex in:
> b9da4d2 mwifiex: avoid double-disable_irq() race
You could still stand to borrow some of the explanation for your commit
message here...
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Fix looks good:
Reviewed-by: Brian Norris <briannorris@chromium.org>
> ---
>
> drivers/bluetooth/btmrvl_sdio.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index d02f2c1..c738bae 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -1682,8 +1682,12 @@ static int btmrvl_sdio_resume(struct device *dev)
> /* Disable platform specific wakeup interrupt */
> if (card->plt_wake_cfg && card->plt_wake_cfg->irq_bt >= 0) {
> disable_irq_wake(card->plt_wake_cfg->irq_bt);
> - if (!card->plt_wake_cfg->wake_by_bt)
> - disable_irq(card->plt_wake_cfg->irq_bt);
> + disable_irq(card->plt_wake_cfg->irq_bt);
> + if (card->plt_wake_cfg->wake_by_bt)
> + /* Undo our disable, since interrupt handler already
> + * did this.
> + */
> + enable_irq(card->plt_wake_cfg->irq_bt);
> }
>
> return 0;
> --
> 2.1.4
>
>
prev parent reply other threads:[~2017-01-20 19:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 11:14 [PATCH 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen
2017-01-20 11:14 ` [PATCH 2/3] btmrvl: set irq_bt to -1 when failed to parse it Jeffy Chen
2017-01-20 19:27 ` Brian Norris
2017-01-20 11:14 ` [PATCH 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
2017-01-20 19:19 ` Brian Norris
2017-01-20 19:29 ` Brian Norris [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=20170120192916.GC84521@google.com \
--to=briannorris@chromium.org \
--cc=akarwar@marvell.com \
--cc=gustavo@padovan.org \
--cc=jeffy.chen@rock-chips.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.