Commit b9da4d22 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo

mwifiex: avoid double-disable_irq() race

We have a race where the wakeup IRQ might be in flight while we're
calling mwifiex_disable_wake() from resume(). This can leave us
disabling the IRQ twice.

Let's disable the IRQ and enable it in case if we have double-disabled
it.
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d96e3927
...@@ -1424,8 +1424,13 @@ static inline void mwifiex_disable_wake(struct mwifiex_adapter *adapter) ...@@ -1424,8 +1424,13 @@ static inline void mwifiex_disable_wake(struct mwifiex_adapter *adapter)
{ {
if (adapter->irq_wakeup >= 0) { if (adapter->irq_wakeup >= 0) {
disable_irq_wake(adapter->irq_wakeup); disable_irq_wake(adapter->irq_wakeup);
if (!adapter->wake_by_wifi)
disable_irq(adapter->irq_wakeup); disable_irq(adapter->irq_wakeup);
if (adapter->wake_by_wifi)
/* Undo our disable, since interrupt handler already
* did this.
*/
enable_irq(adapter->irq_wakeup);
} }
} }
......
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