Skip to content

Commit a4664fa

Browse files
committed
mmc: core: Skip SD UHS-II enumeration on missing UHS2 cap
Fixes: 79daeb2 ("mmc: core: Prepare to support SD UHS-II cards") Signed-off-by: Janne Grunau <j@jannau.net>
1 parent a63e454 commit a4664fa

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/mmc/core/core.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2277,10 +2277,11 @@ void mmc_rescan(struct work_struct *work)
22772277
* while initializing the legacy SD interface. Therefore, let's start
22782278
* with UHS-II for now.
22792279
*/
2280-
if (!mmc_attach_sd_uhs2(host)) {
2281-
mmc_release_host(host);
2282-
goto out;
2283-
}
2280+
if (host->caps2 & MMC_CAP2_SD_UHS2)
2281+
if (!mmc_attach_sd_uhs2(host)) {
2282+
mmc_release_host(host);
2283+
goto out;
2284+
}
22842285

22852286
for (i = 0; i < ARRAY_SIZE(freqs); i++) {
22862287
unsigned int freq = freqs[i];

0 commit comments

Comments
 (0)