Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

drivers/mmc/core/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work)
		* still present
		*/
		if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
		&& mmc_card_is_removable(host))
		&& !(host->caps & MMC_CAP_NONREMOVABLE))
		host->bus_ops->detect(host);

		/*