diff options
| author |   Jeffy Chen <jeffy.chen@rock-chips.com> | 2017-01-23 12:18:52 +0800 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2017-02-16 17:25:20 +0100 |
| commit | fd1a88da81d60a27960174bd9cda312c712961d1 (patch) | |
| tree | 3e2267d75460cbce28504da2a08481508e4d4e24 /drivers/bluetooth | |
| parent | btmrvl: avoid double-disable_irq() race (diff) | |
| download | linux-dev-fd1a88da81d60a27960174bd9cda312c712961d1.tar.xz linux-dev-fd1a88da81d60a27960174bd9cda312c712961d1.zip | |
btmrvl: set irq_bt to -1 when failed to parse it
The irq_of_parse_and_map will return 0 as a invalid irq.
Set irq_bt to -1 in this case, so that the btmrvl resume/suspend code
would not try to enable/disable it.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index c738baeb6d45..796f7194a772 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -97,6 +97,7 @@ static int btmrvl_sdio_probe_of(struct device *dev, cfg->irq_bt = irq_of_parse_and_map(card->plt_of_node, 0); if (!cfg->irq_bt) { dev_err(dev, "fail to parse irq_bt from device tree"); + cfg->irq_bt = -1; } else { ret = devm_request_irq(dev, cfg->irq_bt, btmrvl_wake_irq_bt, |