diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 01:24:11 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 15:05:32 -0700 |
| commit | e2d5a26742e025ec4e24129c132589ec3b491eb4 (patch) | |
| tree | 4090b9226dedf973f3ca627e093574c53635a2bd /patches/collateral-evolutions/network/09-threaded-irq | |
| parent | d7608058240bc8bba1b4ee9f3cc59029184d0545 (diff) | |
backports: refresh patches for next-20130627
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/09-threaded-irq')
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch index d117011e..86e99ff4 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch @@ -22,7 +22,7 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1581,9 +1590,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1582,9 +1591,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; 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 50a85101..aefb69e2 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 -@@ -6063,13 +6063,24 @@ static void wlcore_nvs_cb(const struct f +@@ -5931,13 +5931,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; -@@ -6138,7 +6149,11 @@ out_unreg: +@@ -5983,7 +5994,11 @@ out_unreg: wl1271_unregister_hw(wl); out_irq: @@ -37,7 +37,7 @@ out_free_nvs: kfree(wl->nvs); -@@ -6184,7 +6199,12 @@ int wlcore_remove(struct platform_device +@@ -6029,7 +6044,12 @@ int wlcore_remove(struct platform_device disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); |