Merge "mmc: core: add deferred resume support" (d14f6599) · Commits · e / devices / android_kernel_sony_msm8998

drivers/mmc/core/core.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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;