Commit 8689f4f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull mmc fix from Ulf Hansson:

 - Fix regression of detection of eMMC/SD/SDIO cards

* tag 'mmc-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card"
parents 4c8ab068 fa700d73

drivers/mmc/core/core.c

+4 −11
Original line number Diff line number Diff line
@@ -2199,8 +2199,10 @@ int mmc_card_alternative_gpt_sector(struct mmc_card *card, sector_t *gpt_sector) 
}

EXPORT_SYMBOL(mmc_card_alternative_gpt_sector);



static void __mmc_rescan(struct mmc_host *host)

void mmc_rescan(struct work_struct *work)

{

	struct mmc_host *host =

		container_of(work, struct mmc_host, detect.work);

	int i;



	if (host->rescan_disable)
@@ -2272,14 +2274,6 @@ static void __mmc_rescan(struct mmc_host *host) 
		mmc_schedule_delayed_work(&host->detect, HZ);

}



void mmc_rescan(struct work_struct *work)

{

	struct mmc_host *host =

		container_of(work, struct mmc_host, detect.work);



	__mmc_rescan(host);

}



void mmc_start_host(struct mmc_host *host)

{

	host->f_init = max(min(freqs[0], host->f_max), host->f_min);
@@ -2292,8 +2286,7 @@ void mmc_start_host(struct mmc_host *host) 
	}



	mmc_gpiod_request_cd_irq(host);

	host->detect_change = 1;

	__mmc_rescan(host);

	_mmc_detect_change(host, 0, false);

}



void __mmc_stop_host(struct mmc_host *host)