Commit 3f426c96 authored by Michał Mirosław's avatar Michał Mirosław Committed by Kalle Valo

brcmfmac: initialize oob irq data before request_irq()

This fixes spin-forever in irq handler when IRQ is already asserted
at request_irq() time.
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 42213f2f
...@@ -108,12 +108,14 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) ...@@ -108,12 +108,14 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)
int ret = 0; int ret = 0;
u8 data; u8 data;
u32 addr, gpiocontrol; u32 addr, gpiocontrol;
unsigned long flags;
pdata = &sdiodev->settings->bus.sdio; pdata = &sdiodev->settings->bus.sdio;
if (pdata->oob_irq_supported) { if (pdata->oob_irq_supported) {
brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n", brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
pdata->oob_irq_nr); pdata->oob_irq_nr);
spin_lock_init(&sdiodev->irq_en_lock);
sdiodev->irq_en = true;
ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler, ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
pdata->oob_irq_flags, "brcmf_oob_intr", pdata->oob_irq_flags, "brcmf_oob_intr",
&sdiodev->func[1]->dev); &sdiodev->func[1]->dev);
...@@ -122,10 +124,6 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) ...@@ -122,10 +124,6 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)
return ret; return ret;
} }
sdiodev->oob_irq_requested = true; sdiodev->oob_irq_requested = true;
spin_lock_init(&sdiodev->irq_en_lock);
spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
sdiodev->irq_en = true;
spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
ret = enable_irq_wake(pdata->oob_irq_nr); ret = enable_irq_wake(pdata->oob_irq_nr);
if (ret != 0) { if (ret != 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment