From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 Oct 2013 21:27:39 +0000 (-0700)
Subject: 3.11-stable patches
X-Git-Tag: v3.0.99~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d7a721eea514980380527a536e322511a180d5d;p=thirdparty%2Fkernel%2Fstable-queue.git

3.11-stable patches

added patches:
	cw1200-use-a-threaded-oneshot-irq-handler-for-cw1200_spi.patch
---

diff --git a/queue-3.11/cw1200-use-a-threaded-oneshot-irq-handler-for-cw1200_spi.patch b/queue-3.11/cw1200-use-a-threaded-oneshot-irq-handler-for-cw1200_spi.patch
new file mode 100644
index 00000000000..54f71654aa0
--- /dev/null
+++ b/queue-3.11/cw1200-use-a-threaded-oneshot-irq-handler-for-cw1200_spi.patch
@@ -0,0 +1,39 @@
+From 87421cb6010a2f6494938fbe0a95e1b096b3b7af Mon Sep 17 00:00:00 2001
+From: Solomon Peachy <pizza@shaftnet.org>
+Date: Mon, 23 Sep 2013 16:00:04 -0400
+Subject: cw1200: Use a threaded oneshot irq handler for cw1200_spi
+
+From: Solomon Peachy <pizza@shaftnet.org>
+
+commit 87421cb6010a2f6494938fbe0a95e1b096b3b7af upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/cw1200/cw1200_spi.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- 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(stru
+ 
+ 	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;
+ 
diff --git a/queue-3.11/series b/queue-3.11/series
index a172088d276..897a7161609 100644
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -25,3 +25,4 @@ staging-vt6656-main_usb.c-oops-on-device_close-move-flag-earlier.patch
 staging-vt6656-iwctl_siwencodeext-return-if-device-not-open.patch
 drm-i915-tv-clear-adjusted_mode.flags.patch
 revert-cw1200-don-t-perform-spi-transfers-in-interrupt-context.patch
+cw1200-use-a-threaded-oneshot-irq-handler-for-cw1200_spi.patch