Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687530b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 78833dd7 bad3baba

drivers/mmc/core/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work) 
	 * still present

	 * still present

	 */

	 */

	if (host->bus_ops && host->bus_ops->detect && !host->bus_dead

	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);

		host->bus_ops->detect(host);





	/*

	/*