Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+3 −5
Original line number Diff line number Diff line
@@ -108,12 +108,14 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) 
	int ret = 0;

	u8 data;

	u32 addr, gpiocontrol;

	unsigned long flags;



	pdata = &sdiodev->settings->bus.sdio;

	if (pdata->oob_irq_supported) {

		brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",

			  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,

				  pdata->oob_irq_flags, "brcmf_oob_intr",

				  &sdiodev->func[1]->dev);
@@ -122,10 +124,6 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) 
			return ret;

		}

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

		if (ret != 0) {