Commit 0579e303 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  MMC: Do not set unsupported bits in OCR response
  MMC: Poll card status after rescanning cards
parents 0f66c08e 63ef731a

drivers/mmc/mmc.c

+17 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) 
	if (bit) {

		bit -= 1;



		ocr = 3 << bit;

		ocr &= 3 << bit;



		host->ios.vdd = bit;

		mmc_set_ios(host);
@@ -1178,14 +1178,29 @@ static void mmc_rescan(void *data) 
{

	struct mmc_host *host = data;

	struct list_head *l, *n;

	unsigned char power_mode;



	mmc_claim_host(host);



	if (host->ios.power_mode == MMC_POWER_ON)

	/*

	 * Check for removed cards and newly inserted ones. We check for

	 * removed cards first so we can intelligently re-select the VDD.

	 */

	power_mode = host->ios.power_mode;

	if (power_mode == MMC_POWER_ON)

		mmc_check_cards(host);



	mmc_setup(host);



	/*

	 * Some broken cards process CMD1 even in stand-by state. There is

	 * no reply, but an ILLEGAL_COMMAND error is cached and returned

	 * after next command. We poll for card status here to clear any

	 * possibly pending error.

	 */

	if (power_mode == MMC_POWER_ON)

		mmc_check_cards(host);



	if (!list_empty(&host->cards)) {

		/*

		 * (Re-)calculate the fastest clock rate which the