diff options
| author | Brian Norris <briannorris@chromium.org> | 2019-04-09 11:49:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-08 07:21:52 +0200 |
| commit | f5ad05e680aa40a14a43073f9ccf7b43a0237aea (patch) | |
| tree | ca168a7fd85fe8446a1b147ffb76b9e643ca04f8 /drivers/bluetooth | |
| parent | 3f8497cfff3bcfe87d0ba08f691a96e0e3caf6cf (diff) | |
| download | linux-stable-f5ad05e680aa40a14a43073f9ccf7b43a0237aea.tar.gz linux-stable-f5ad05e680aa40a14a43073f9ccf7b43a0237aea.tar.bz2 linux-stable-f5ad05e680aa40a14a43073f9ccf7b43a0237aea.zip | |
Bluetooth: btusb: request wake pin with NOAUTOEN
commit 771acc7e4a6e5dba779cb1a7fd851a164bc81033 upstream.
Badly-designed systems might have (for example) active-high wake pins
that default to high (e.g., because of external pull ups) until they
have an active firmware which starts driving it low. This can cause an
interrupt storm in the time between request_irq() and disable_irq().
We don't support shared interrupts here, so let's just pre-configure the
interrupt to avoid auto-enabling it.
Fixes: fd913ef7ce61 ("Bluetooth: btusb: Add out-of-band wakeup support")
Fixes: 5364a0b4f4be ("arm64: dts: rockchip: move QCA6174A wakeup pin into its USB node")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 77b67a5f21ee..40a4f95f6178 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2888,6 +2888,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) return 0; } + irq_set_status_flags(irq, IRQ_NOAUTOEN); ret = devm_request_irq(&hdev->dev, irq, btusb_oob_wake_handler, 0, "OOB Wake-on-BT", data); if (ret) { @@ -2902,7 +2903,6 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) } data->oob_wake_irq = irq; - disable_irq(irq); bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq); return 0; } |