Skip to content

Commit 70fa806

Browse files
ArseneWgrkhuangtao
authored andcommitted
HACK: mmc: core: fixes not send_status after switch timing
Fixes 3527e57 (HACK: mmc: core: fix switching ... ...) Change-Id: Id46840452e4bc87efb93e785cd8bbac5f708552d Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
1 parent 4017737 commit 70fa806

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

drivers/mmc/core/mmc.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,13 +1008,9 @@ static int mmc_select_hs(struct mmc_card *card)
10081008
EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,
10091009
card->ext_csd.generic_cmd6_time,
10101010
true, false, true);
1011-
if (!err) {
1011+
if (!err)
10121012
mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
10131013

1014-
mmc_set_clock(card->host, card->ext_csd.hs_max_dtr);
1015-
err = mmc_switch_status(card);
1016-
}
1017-
10181014
if (err)
10191015
pr_warn("%s: switch to high-speed failed, err:%d\n",
10201016
mmc_hostname(card->host), err);
@@ -1379,15 +1375,6 @@ static int mmc_select_hs200(struct mmc_card *card)
13791375
goto err;
13801376
old_timing = host->ios.timing;
13811377
mmc_set_timing(host, MMC_TIMING_MMC_HS200);
1382-
1383-
mmc_set_clock(host, card->ext_csd.hs200_max_dtr);
1384-
err = mmc_switch_status(card);
1385-
/*
1386-
* mmc_select_timing() assumes timing has not changed if
1387-
* it is a switch error.
1388-
*/
1389-
if (err == -EBADMSG)
1390-
mmc_set_timing(host, old_timing);
13911378
}
13921379
err:
13931380
if (err) {

0 commit comments

Comments
 (0)