diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-02 14:25:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-02 14:25:02 -0800 |
| commit | d14f6599ce3c215d75ed290f418bfd25e57826b1 (patch) | |
| tree | c5f59daf93b011e8ea00f187cba94ba386ef20f1 | |
| parent | b6579def54b6949de8a60631f81191d22048b57b (diff) | |
| parent | 3059e03a6b8d623bc82c9dfb42483ddee3350c96 (diff) | |
Merge "mmc: core: add deferred resume support"
| -rw-r--r-- | drivers/mmc/core/core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a444a3a80f52..152a3e3b4f47 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1748,6 +1748,10 @@ EXPORT_SYMBOL(mmc_start_req); */ void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq) { +#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME + if (mmc_bus_needs_resume(host)) + mmc_resume_bus(host); +#endif __mmc_start_req(host, mrq); mmc_wait_for_req_done(host, mrq); } @@ -3105,9 +3109,6 @@ int mmc_resume_bus(struct mmc_host *host) } } - if (host->bus_ops->detect && !host->bus_dead) - host->bus_ops->detect(host); - mmc_bus_put(host); pr_debug("%s: Deferred resume completed\n", mmc_hostname(host)); return 0; |