Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MMC core:

Browse Source 
- Fix regression of detection of eMMC/SD/SDIO cards
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmSoKagXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCkfLg//fbq526OmomJIdc/SgCpHnxTE
 9lZ8Wca2WK8POlQznx2hvantOBlnSuhowOpybrt/vd4zadANFuJd+/p5Q4fAxpX7
 j1KfZIVnFEG15/gfXzcXZsXkn6JwShah0w4p+UzOD+nsEGjNZYjuF0rvMYVRC6xY
 0fdVrWToDfqgpg1Ac1zWIIVQcdIeycJf4tY0FcoEcl2+QotqdMlo3EilexCkYeUs
 Ymc90W978U+uYgD8kIhq6fi0rGjRM+vDVkdMp7xJpaxdWzHSBSfY6BZw3W4Z+2vP
 Ze0GqBWbEezFCpH6VZZ+twq7elYwuf7DvjIRZS5dzO4W+dQXVeMXstfkrwbHy+/W
 NkD/4QXwO1YBbm0c2lvHnG7W6lncM0KgdOmMZV3aocJmRsAnHY/NZ75A7ZyKZsUj
 poJPlQ9UjXw4DxpeM2lOC8CEsYaYzWVNPpAZB22ZZ1ji3muDK8nX1ugp8gPaIVbG
 pwWWMpqBiVfWUE1N3+o2sbx+Bzm1mi3zN5haQf7mk9rUsQj28ftTtvTPQF4U/FgV
 PIC+2ljaKUTSEF4kbxX/T+i8dfPAV6icTyp67gzpORGoZB6+Y9X6I0jypO/xtTGB
 8BNzyGyZ5h3Bu249+Q/OYNwKKL2zwlz7LDrzbAzzS57JxRQUlwc9j8cRZC0BNsFU
 2uDFfIcU5+HHG+3i89c=
 =nFat
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2023-07-07 15:59:33 -07:00
commit 8689f4f2ea
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/core/core.c
View File

@ -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)