summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fenkart <afenkart@gmail.com>2014-07-21 10:01:52 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-07-22 19:53:17 +0200
commit81df6cafe28b358739d121205e1ddaeec2ed5b15 (patch)
tree999a957dba23ebe3549c8c7dce2431cc85b56502
parentMerge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-81df6cafe28b358739d121205e1ddaeec2ed5b15.tar.xz
linux-81df6cafe28b358739d121205e1ddaeec2ed5b15.zip
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>
-rw-r--r--drivers/net/wireless/mwifiex/sdio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 3e48ef5ca53c..1770fa3fc1e6 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1954,6 +1954,7 @@ static void mwifiex_sdio_card_reset_work(struct mwifiex_adapter *adapter)
mmc_remove_host(target);
/* 20ms delay is based on experiment with sdhci controller */
mdelay(20);
+ target->rescan_entered = 0; /* rescan non-removable cards */
mmc_add_host(target);
}