Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc (5a2b3ef4) · Commits · e / devices / android_kernel_teracube_2e

drivers/mmc/core/core.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -1631,6 +1631,19 @@ int mmc_suspend_host(struct mmc_host *host)
		if (host->bus_ops && !host->bus_dead) {
		if (host->bus_ops->suspend)
		err = host->bus_ops->suspend(host);
		if (err == -ENOSYS \|\| !host->bus_ops->resume) {
		/*
		* We simply "remove" the card in this case.
		* It will be redetected on resume.
		*/
		if (host->bus_ops->remove)
		host->bus_ops->remove(host);
		mmc_claim_host(host);
		mmc_detach_bus(host);
		mmc_release_host(host);
		host->pm_flags = 0;
		err = 0;
		}
		}
		mmc_bus_put(host);