Re: [PATCH 1/3] btmrvl: avoid double-disable_irq() race

From	Brian Norris <briannorris@chromium.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 1/3] btmrvl: avoid double-disable_irq() race
Date	2017-01-20 20:30 +0100
Message-ID	<t1N2O-2Ry-49@gated-at.bofh.it> (permalink)
References	<t1Fyh-6Cb-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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
> 
>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-20 12:30 +0100
  [PATCH 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-20 12:30 +0100
    Re: [PATCH 3/3] btmrvl: use dt's irqflags for wakeup pin Brian Norris <briannorris@chromium.org> - 2017-01-20 20:30 +0100
  [PATCH 2/3] btmrvl: set irq_bt to -1 when failed to parse it Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-20 12:30 +0100
    Re: [PATCH 2/3] btmrvl: set irq_bt to -1 when failed to parse it Brian Norris <briannorris@chromium.org> - 2017-01-20 20:30 +0100
  Re: [PATCH 1/3] btmrvl: avoid double-disable_irq() race Brian Norris <briannorris@chromium.org> - 2017-01-20 20:30 +0100

csiph-web