| Message ID | 20240910124314.698896-3-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a98dd48b6d834d7a3fe5e8e7b8c3a1d006f9685 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: Use IRQF_NO_AUTOEN flag in request_irq() | expand |
On Tue, Sep 10, 2024 at 08:43:13PM +0800, Jinjie Ruan wrote: > disable_irq() after request_irq() still has a time gap in which > interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will > disable IRQ auto-enable when request IRQ. > > Fixes: 853402a00823 ("mwifiex: Enable WoWLAN for both sdio and pcie") > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > --- > v2: > - Add fix tag. > - Wireless patches go to wireless-next, submit them in a separate patchset. > --- > drivers/net/wireless/marvell/mwifiex/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Brian Norris <briannorris@chromium.org>
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index d99127dc466e..6c60a4c21a31 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -1633,7 +1633,8 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter) } ret = devm_request_irq(dev, adapter->irq_wakeup, - mwifiex_irq_wakeup_handler, IRQF_TRIGGER_LOW, + mwifiex_irq_wakeup_handler, + IRQF_TRIGGER_LOW | IRQF_NO_AUTOEN, "wifi_wake", adapter); if (ret) { dev_err(dev, "Failed to request irq_wakeup %d (%d)\n", @@ -1641,7 +1642,6 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter) goto err_exit; } - disable_irq(adapter->irq_wakeup); if (device_init_wakeup(dev, true)) { dev_err(dev, "fail to init wakeup for mwifiex\n"); goto err_exit;
disable_irq() after request_irq() still has a time gap in which interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will disable IRQ auto-enable when request IRQ. Fixes: 853402a00823 ("mwifiex: Enable WoWLAN for both sdio and pcie") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- v2: - Add fix tag. - Wireless patches go to wireless-next, submit them in a separate patchset. --- drivers/net/wireless/marvell/mwifiex/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)