backports: revert commit for mwifiex sido.
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 26 Jul 2014 20:56:55 +0000 (22:56 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 27 Jul 2014 21:46:44 +0000 (23:46 +0200)
Revert this commit on kernel version < 3.7

    mwifiex: card reset: enable rescan of non-removable card

    mmc_rescan will scan for non-removable cards only once, hence the card
    will not be rediscovered.

Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch [new file with mode: 0644]

diff --git a/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch b/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch
new file mode 100644 (file)
index 0000000..89de2fb
--- /dev/null
@@ -0,0 +1,12 @@
+--- a/drivers/net/wireless/mwifiex/sdio.c
++++ b/drivers/net/wireless/mwifiex/sdio.c
+@@ -1954,7 +1954,9 @@ static void mwifiex_sdio_card_reset_work
+       mmc_remove_host(target);
+       /* 20ms delay is based on experiment with sdhci controller */
+       mdelay(20);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+       target->rescan_entered = 0; /* rescan non-removable cards */
++#endif
+       mmc_add_host(target);
+ }