summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/29-sdio_no_suspend
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-05-26 21:52:28 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-28 11:30:36 -0700
commitc4c5e4302df48f23f71c034ef60c885986a36815 (patch)
tree1702bf988d414bb722163d2d27179d022b2eb0bb /patches/collateral-evolutions/network/29-sdio_no_suspend
parent0aa997a467ea3e153d652faecd0de20ae022304b (diff)
backports: refresh patches on next-20130523
== 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.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ 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.patch10
1 files changed, 5 insertions, 5 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 9ceddc41..06c18bc5 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
-@@ -129,8 +129,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -140,8 +140,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]) ==
-@@ -147,6 +149,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -158,6 +160,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
kfree(card);
}
@@ -19,7 +19,7 @@
/*
* SDIO suspend.
*
-@@ -246,6 +249,7 @@ static int mwifiex_sdio_resume(struct de
+@@ -257,6 +260,7 @@ static int mwifiex_sdio_resume(struct de
return 0;
}
@@ -27,7 +27,7 @@
/* Device ID for SD8786 */
#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
-@@ -264,10 +268,12 @@ static const struct sdio_device_id mwifi
+@@ -282,10 +286,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",
-@@ -276,7 +282,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -294,7 +300,9 @@ static struct sdio_driver mwifiex_sdio =
.remove = mwifiex_sdio_remove,
.drv = {
.owner = THIS_MODULE,