aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/cw1200/fwio.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2013-09-23 16:00:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-09-26 14:02:31 -0400
commitc4fb19d21b003ec99ec490ba2cb60baffabc73f3 (patch)
treee0ca5dca3c5149f20b15adcd47e03f49fb5c94e6 /drivers/net/wireless/cw1200/fwio.c
parentb7be1522def9a9988b67afd0be999c50a96394b5 (diff)
Revert "cw1200: Don't perform SPI transfers in interrupt context"
This reverts commit aec8e88c947b7017e2b4bbcb68a4bfc4a1f8ad35. This solution turned out to cause interrupt delivery problems, and rather than trying to fix this approach, it has been scrapped in favor of an alternative (and far simpler) implementation. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/cw1200/fwio.c')
-rw-r--r--drivers/net/wireless/cw1200/fwio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/cw1200/fwio.c
index 0b2061bbc68b..acdff0f7f952 100644
--- a/drivers/net/wireless/cw1200/fwio.c
+++ b/drivers/net/wireless/cw1200/fwio.c
@@ -485,7 +485,7 @@ int cw1200_load_firmware(struct cw1200_common *priv)
485 485
486 /* Enable interrupt signalling */ 486 /* Enable interrupt signalling */
487 priv->hwbus_ops->lock(priv->hwbus_priv); 487 priv->hwbus_ops->lock(priv->hwbus_priv);
488 ret = __cw1200_irq_enable(priv, 2); 488 ret = __cw1200_irq_enable(priv, 1);
489 priv->hwbus_ops->unlock(priv->hwbus_priv); 489 priv->hwbus_ops->unlock(priv->hwbus_priv);
490 if (ret < 0) 490 if (ret < 0)
491 goto unsubscribe; 491 goto unsubscribe;