summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2013-09-23 16:00:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-09-26 14:02:31 -0400
commit87421cb6010a2f6494938fbe0a95e1b096b3b7af (patch)
treeb96cd185d3bc2bbc39c6434244b29dbee95beea4 /drivers
parentc4fb19d21b003ec99ec490ba2cb60baffabc73f3 (diff)
downloadlinux-87421cb6010a2f6494938fbe0a95e1b096b3b7af.tar.gz
linux-87421cb6010a2f6494938fbe0a95e1b096b3b7af.tar.bz2
linux-87421cb6010a2f6494938fbe0a95e1b096b3b7af.zip
cw1200: Use a threaded oneshot irq handler for cw1200_spi
This supercedes the older patch ("cw1200: Don't perform SPI transfers in interrupt context") that badly attempted to fix this problem. This is a far simpler solution, which has the added benefit of actually working. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/cw1200/cw1200_spi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index 5a64ac963009..899cad34ccd3 100644
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -250,9 +250,10 @@ static int cw1200_spi_irq_subscribe(struct hwbus_priv *self)
pr_debug("SW IRQ subscribe\n");
- ret = request_any_context_irq(self->func->irq, cw1200_spi_irq_handler,
- IRQF_TRIGGER_HIGH,
- "cw1200_wlan_irq", self);
+ ret = request_threaded_irq(self->func->irq, NULL,
+ cw1200_spi_irq_handler,
+ IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+ "cw1200_wlan_irq", self);
if (WARN_ON(ret < 0))
goto exit;