summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/09-threaded-irq
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-17 22:55:03 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-23 20:13:20 +0200
commit4f84b99aa0141d83be69c8e408480c26b58f7df4 (patch)
treeb5a6d083033022dbc09173f9e606724e5373856a /patches/collateral-evolutions/network/09-threaded-irq
parente8acf3936710c3466d49314407303f87a4e64535 (diff)
backports: refresh on next-20130830backports-20130830
== ckmake-report.log == 1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.98 [ OK ] 17 3.1.10 [ OK ] 18 3.10.14 [ OK ] 19 3.11.3 [ OK ] 20 3.12-rc3 [ FAIL ] 21 3.2.51 [ OK ] 22 3.3.8 [ OK ] 23 3.4.64 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/09-threaded-irq')
-rw-r--r--patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch6
-rw-r--r--patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch6
2 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
index 46e881e6..32801a7c 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -4238,8 +4238,13 @@ redo:
+@@ -4239,8 +4239,13 @@ redo:
if (b43_bus_host_is_sdio(dev->dev)) {
b43_sdio_free_irq(dev);
} else {
@@ -14,7 +14,7 @@
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
-@@ -4285,9 +4290,17 @@ static int b43_wireless_core_start(struc
+@@ -4286,9 +4291,17 @@ static int b43_wireless_core_start(struc
goto out;
}
} else {
@@ -32,7 +32,7 @@
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
dev->dev->irq);
-@@ -5110,6 +5123,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5125,6 +5138,10 @@ static int b43_setup_bands(struct b43_wl
static void b43_wireless_core_detach(struct b43_wldev *dev)
{
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
index aefb69e2..05f61116 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -5931,13 +5931,24 @@ static void wlcore_nvs_cb(const struct f
+@@ -5932,13 +5932,24 @@ static void wlcore_nvs_cb(const struct f
wl->platform_quirks = pdata->platform_quirks;
wl->if_ops = pdev_data->if_ops;
@@ -25,7 +25,7 @@
if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret);
goto out_free_nvs;
-@@ -5983,7 +5994,11 @@ out_unreg:
+@@ -5984,7 +5995,11 @@ out_unreg:
wl1271_unregister_hw(wl);
out_irq:
@@ -37,7 +37,7 @@
out_free_nvs:
kfree(wl->nvs);
-@@ -6029,7 +6044,12 @@ int wlcore_remove(struct platform_device
+@@ -6030,7 +6045,12 @@ int wlcore_remove(struct platform_device
disable_irq_wake(wl->irq);
}
wl1271_unregister_hw(wl);