summaryrefslogtreecommitdiff
path: root/patches/09-threaded-irq.patch
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-09 13:23:55 -0800
committerLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-09 13:23:55 -0800
commit0372f806185cb94434aa8d2def1952362d621e4d (patch)
tree8a425b107c9f768f7930aaeca2ccb30a371daf74 /patches/09-threaded-irq.patch
parent117e018aa2375277e20a9161737376e75fa1c983 (diff)
compat-wireless: refresh patches
This runs: ./scripts/admin-update.sh refresh This refreshes all hunk offests automatically. Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches/09-threaded-irq.patch')
-rw-r--r--patches/09-threaded-irq.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 5986a089..33a51b64 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -63,7 +63,7 @@ thread in process context as well.
/* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -5439,14 +5439,25 @@ static int __devinit wl12xx_probe(struct
+@@ -5493,14 +5493,25 @@ static int __devinit wl12xx_probe(struct
platform_set_drvdata(pdev, wl);
@@ -89,7 +89,7 @@ thread in process context as well.
if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret);
goto out_free_hw;
-@@ -5500,7 +5511,11 @@ out_bt_coex_state:
+@@ -5554,7 +5565,11 @@ out_bt_coex_state:
device_remove_file(wl->dev, &dev_attr_bt_coex_state);
out_irq:
@@ -101,7 +101,7 @@ thread in process context as well.
out_free_hw:
wl1271_free_hw(wl);
-@@ -5518,7 +5533,12 @@ static int __devexit wl12xx_remove(struc
+@@ -5572,7 +5587,12 @@ static int __devexit wl12xx_remove(struc
disable_irq_wake(wl->irq);
}
wl1271_unregister_hw(wl);