There is a race condition during wl12xx_probe that the interrupt
may arrives before the probe completed. An irq could triggers an
irq thread to run to process the irq work but the probe process has
not finished.
---
drivers/net/wireless/wl12xx/main.c | 47 ++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c
b/drivers/net/wireless/wl12xx/main.c
index 3900236..be18a1c 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -5493,29 +5493,6 @@ static int __devinit wl12xx_probe(struct
platform_device *pdev)
platform_set_drvdata(pdev, wl);
- if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
- irqflags = IRQF_TRIGGER_RISING;
- else
- irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
-
- ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wl1271_irq,
- irqflags,
- pdev->name, wl);
- if (ret < 0) {
- wl1271_error("request_irq() failed: %d", ret);
- goto out_free_hw;
- }
-
- ret = enable_irq_wake(wl->irq);
- if (!ret) {
- wl->irq_wake_enabled = true;
- device_init_wakeup(wl->dev, 1);
- if (pdata->pwr_in_suspend)
- hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
-
- }
- disable_irq(wl->irq);
-
ret = wl1271_init_ieee80211(wl);
if (ret)
goto out_irq;
@@ -5545,6 +5522,30 @@ static int __devinit wl12xx_probe(struct
platform_device *pdev)
goto out_hw_pg_ver;
}
+ if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
+ irqflags = IRQF_TRIGGER_RISING;
+ else
+ irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+
+ ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wl1271_irq,
+ irqflags,
+ pdev->name, wl);
+ if (ret < 0) {
+ wl1271_error("request_irq() failed: %d", ret);
+ goto out_free_hw;
+ }
+
+ ret = enable_irq_wake(wl->irq);
+ if (!ret) {
+ wl->irq_wake_enabled = true;
+ device_init_wakeup(wl->dev, 1);
+ if (pdata->pwr_in_suspend)
+ hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+
+ }
+ disable_irq(wl->irq);
+
+
return 0;
out_hw_pg_ver:
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
