diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-08-19 01:38:03 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-27 11:43:04 -0700 |
| commit | d1e6a65bed09e5f5da9ba4069210570694edd5df (patch) | |
| tree | 87863ba8ef1a53325ad39e003880734f8f84f402 /patches/collateral-evolutions/network/29-sdio_no_suspend | |
| parent | 09556c795e8afb6672893d41a05a6728c306e5f6 (diff) | |
backports: refresh patches on next-20130802
== ckmake-report.log ==
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.89 [ OK ]
18 3.1.10 [ OK ]
19 3.10.5 [ OK ]
20 3.11-rc4 [ OK ]
21 3.2.50 [ OK ]
22 3.3.8 [ OK ]
23 3.4.56 [ 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>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/29-sdio_no_suspend')
| -rw-r--r-- | patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch index 8d2d67d3..3dc2888b 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -141,8 +141,10 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -183,8 +183,10 @@ mwifiex_sdio_remove(struct sdio_func *fu wait_for_completion(&adapter->fw_load); if (user_rmmod) { @@ -11,7 +11,7 @@ for (i = 0; i < adapter->priv_num; i++) if ((GET_BSS_ROLE(adapter->priv[i]) == -@@ -159,6 +161,7 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -201,6 +203,7 @@ mwifiex_sdio_remove(struct sdio_func *fu kfree(card); } @@ -19,15 +19,15 @@ /* * SDIO suspend. * -@@ -258,6 +261,7 @@ static int mwifiex_sdio_resume(struct de +@@ -255,6 +258,7 @@ static int mwifiex_sdio_suspend(struct d - return 0; + return ret; } +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ /* Device ID for SD8786 */ #define SDIO_DEVICE_ID_MARVELL_8786 (0x9116) -@@ -283,10 +287,12 @@ static const struct sdio_device_id mwifi +@@ -280,10 +284,12 @@ static const struct sdio_device_id mwifi MODULE_DEVICE_TABLE(sdio, mwifiex_ids); @@ -40,7 +40,7 @@ static struct sdio_driver mwifiex_sdio = { .name = "mwifiex_sdio", -@@ -295,7 +301,9 @@ static struct sdio_driver mwifiex_sdio = +@@ -292,7 +298,9 @@ static struct sdio_driver mwifiex_sdio = .remove = mwifiex_sdio_remove, .drv = { .owner = THIS_MODULE, |