sdio:Wifi: tmp modify for wifi abnormal after suspend.
authorgwl <gwl@rock-chips.com>
Tue, 1 Apr 2014 03:52:55 +0000 (11:52 +0800)
committergwl <gwl@rock-chips.com>
Tue, 1 Apr 2014 03:53:01 +0000 (11:53 +0800)
drivers/mmc/core/sdio.c

index adfabcef34375d33c99cdf0e312f2c0fd9abab58..dc2178c6615bad339e25f5ac38a30456a0bd8280 100644 (file)
@@ -1022,7 +1022,12 @@ static int mmc_sdio_resume(struct mmc_host *host)
        }
 
        /* No need to reinitialize powered-resumed nonremovable cards */
-       if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) {
+    // tmp modify for wifi abnormal after suspend (gwl)
+    // mmc2: error -110 during resume (card was removed?)
+    // dpm_run_callback(): mmc_bus_resume+0x0/0x78 returns -110
+    // PM: Device mmc2:0001 failed to resume: error -110
+       if (!(host->restrict_caps & RESTRICT_CARD_TYPE_SDIO) &&
+           (mmc_card_is_removable(host) || !mmc_card_keep_power(host))) {
                sdio_reset(host);
                mmc_go_idle(host);
                err = mmc_sdio_init_card(host, host->card->ocr, host->card,