]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mwifiex: Use IRQF_NO_AUTOEN flag in request_irq()
authorJinjie Ruan <ruanjinjie@huawei.com>
Tue, 10 Sep 2024 12:43:13 +0000 (20:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:50:52 +0000 (19:50 +0100)
[ Upstream commit 9a98dd48b6d834d7a3fe5e8e7b8c3a1d006f9685 ]

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>
Acked-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240910124314.698896-3-ruanjinjie@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/marvell/mwifiex/main.c

index 7943fd3b3058d27bdefc7c3da7280a86a0702bbf..18ab3222b1406ce1f3f409beac43dc0b217db1fa 100644 (file)
@@ -1614,7 +1614,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",
@@ -1622,7 +1623,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;