Merge "mmc: core: Hold host resume status while card rescan is in progress" (42ec3b12) · Commits · e / devices / android_kernel_sony_msm8994

drivers/mmc/core/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3322,6 +3322,7 @@ void mmc_rescan(struct work_struct *work)
		host->rescan_entered = 1;

		mmc_bus_get(host);
		mmc_rpm_hold(host, &host->class_dev);

		/*
		* if there is a _removable_ card registered, check whether it is
		@@ -3354,10 +3355,13 @@ void mmc_rescan(struct work_struct *work)

		/* if there still is a card present, stop here */
		if (host->bus_ops != NULL) {
		mmc_rpm_release(host, &host->class_dev);
		mmc_bus_put(host);
		goto out;
		}

		mmc_rpm_release(host, &host->class_dev);

		/*
		* Only we can add a new handler, so it's safe to
		* release the lock here.