diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-05-20 00:20:51 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-19 17:36:08 -0700 |
| commit | 7c49064a85c8a3a06e66e77f82aae1548dda960c (patch) | |
| tree | c9092948426115ce7fdbd694b01fcf0b99f95efe /patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch | |
| parent | 8badd50471ff1dd1388d96514d719b0ad15cc695 (diff) | |
backport: refresh patches on next-20130513
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch | 6 |
1 files changed, 3 insertions, 3 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 c2a43440..aaa0aa06 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 -@@ -4243,8 +4243,13 @@ redo: +@@ -4236,8 +4236,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; -@@ -4290,9 +4295,17 @@ static int b43_wireless_core_start(struc +@@ -4283,9 +4288,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); -@@ -5115,6 +5128,10 @@ static int b43_setup_bands(struct b43_wl +@@ -5108,6 +5121,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { |