aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-12-16 16:38:12 +1100
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-03-09 14:43:47 +0100
commite1ec68681522681781b3583c19118a057a6bec37 (patch)
tree9f33aba9bc894dadf62352b44a648e2265ca123a
parentd4738fd74d296d85bf3ee76b99a4be340a180461 (diff)
downloadkernel_goldelico_gta04-e1ec68681522681781b3583c19118a057a6bec37.zip
kernel_goldelico_gta04-e1ec68681522681781b3583c19118a057a6bec37.tar.gz
kernel_goldelico_gta04-e1ec68681522681781b3583c19118a057a6bec37.tar.bz2
Allow wifi to be rescanned on resume.
commit 3339d1e33185798a45dbdb5ea6c0bec1c27ca5fd mmc: core: Do not rescan non-removable devices breaks wifi on resume because it stops the rescan. So clear the 'rescan_entered' flag when we suspend. Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/mmc/core/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 06c42cf..65b8935 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2433,6 +2433,7 @@ int mmc_suspend_host(struct mmc_host *host)
mmc_claim_host(host);
mmc_detach_bus(host);
mmc_power_off(host);
+ host->rescan_entered = 0;
mmc_release_host(host);
host->pm_flags = 0;
err = 0;