Skip to content

Commit c45a413

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 7ef2386 commit c45a413

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
@@ -2268,10 +2268,11 @@ void mmc_rescan(struct work_struct *work)
22682268
* while initializing the legacy SD interface. Therefore, let's start
22692269
* with UHS-II for now.
22702270
*/
2271-
if (!mmc_attach_sd_uhs2(host)) {
2272-
mmc_release_host(host);
2273-
goto out;
2274-
}
2271+
if (host->caps2 & MMC_CAP2_SD_UHS2)
2272+
if (!mmc_attach_sd_uhs2(host)) {
2273+
mmc_release_host(host);
2274+
goto out;
2275+
}
22752276

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

0 commit comments

Comments
 (0)