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

Commit 908448a3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Send SD card initialization sequence in deferred resume path"

parents 2439737d 3498a2f3

drivers/mmc/core/mmc.c

+5 −2
Original line number Diff line number Diff line
@@ -2863,10 +2863,13 @@ static int mmc_resume(struct mmc_host *host) 
	int err = 0;



	MMC_TRACE(host, "%s: Enter\n", __func__);

	err = _mmc_resume(host);

	pm_runtime_set_active(&host->card->dev);

	pm_runtime_mark_last_busy(&host->card->dev);

	pm_runtime_enable(&host->card->dev);



	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);

	return 0;



	return err;

}



#define MAX_DEFER_SUSPEND_COUNTER 20

drivers/mmc/core/sd.c

+5 −2
Original line number Diff line number Diff line
@@ -1348,10 +1348,13 @@ static int mmc_sd_resume(struct mmc_host *host) 
	int err = 0;



	MMC_TRACE(host, "%s: Enter\n", __func__);

	err = _mmc_sd_resume(host);

	pm_runtime_set_active(&host->card->dev);

	pm_runtime_mark_last_busy(&host->card->dev);

	pm_runtime_enable(&host->card->dev);



	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);

	return 0;



	return err;

}



/*