Skip to content

Commit c44b082

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 2d24294 commit c44b082

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
@@ -2280,10 +2280,11 @@ void mmc_rescan(struct work_struct *work)
22802280
* while initializing the legacy SD interface. Therefore, let's start
22812281
* with UHS-II for now.
22822282
*/
2283-
if (!mmc_attach_sd_uhs2(host)) {
2284-
mmc_release_host(host);
2285-
goto out;
2286-
}
2283+
if (host->caps2 & MMC_CAP2_SD_UHS2)
2284+
if (!mmc_attach_sd_uhs2(host)) {
2285+
mmc_release_host(host);
2286+
goto out;
2287+
}
22872288

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

0 commit comments

Comments
 (0)