bcmdhd: do not turn off mmc at probe
Mursalin Akon [Fri, 31 Aug 2012 17:46:22 +0000 (10:46 -0700)]
Do not turn off mmc at probe if watchdog thread is
in use.

Bug 1029792
Bug 1029733

Change-Id: Ia2e303daa27688c96e7fa5941e01cf821166c498
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/141628
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
GVS: Gerrit_Virtual_Submit

drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c

index 1a315b4..6ca8531 100644 (file)
@@ -132,8 +132,10 @@ static int bcmsdh_sdmmc_probe(struct sdio_func *func,
 #endif
                sd_trace(("F2 found, calling bcmsdh_probe_bcmdhd...\n"));
                ret = bcmsdh_probe_bcmdhd(&func->dev);
+#ifndef DHDTHREAD
                if (mmc_power_save_host(func->card->host))
                        sd_err(("%s: card power save fail", __FUNCTION__));
+#endif
        }
 
        return ret;