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

Commit 967b3b68 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Fix error when SD card is removed"

parents ced4c545 6bdf4fce

drivers/mmc/core/core.c

+3 −2
Original line number Diff line number Diff line
@@ -1805,12 +1805,13 @@ int mmc_try_claim_host(struct mmc_host *host, unsigned int delay_ms) 
	unsigned long flags;

	int retry_cnt = delay_ms/10;

	bool pm = false;

	struct task_struct *task = current;



	do {

		spin_lock_irqsave(&host->lock, flags);

		if (!host->claimed || host->claimer->task == current) {

		if (!host->claimed || mmc_ctx_matches(host, NULL, task)) {

			host->claimed = 1;

			host->claimer->task = current;

			mmc_ctx_set_claimer(host, NULL, task);

			host->claim_cnt += 1;

			claimed_host = 1;

			if (host->claim_cnt == 1)

drivers/mmc/core/sd.c

+0 −2
Original line number Diff line number Diff line
@@ -1197,8 +1197,6 @@ static void mmc_sd_detect(struct mmc_host *host) 
		return;

	}



	mmc_get_card(host->card, NULL);



	/*

	 * Just check if our card has been removed.

	 */