From: Ziyuan Xu Date: Thu, 22 Sep 2016 09:19:21 +0000 (+0800) Subject: mmc: core: don't try to switch block size for dual rate mode X-Git-Tag: firefly_0821_release~1491 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a586397e80d28f43a8308d221e0b98e5ecafd71e;p=firefly-linux-kernel-4.4.55.git mmc: core: don't try to switch block size for dual rate mode Per spec, block size should always be 512 bytes for dual rate mode, so any attempts to switch the block size under dual rate mode should be neglected. Change-Id: I6ede0d8fd6c7b8e4903a51c1c2a1b96d350bd2e2 Signed-off-by: Ziyuan Xu Signed-off-by: Shawn Lin Signed-off-by: xiaoyao --- diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index eb2f0917c4e7..d72977c999ad 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2419,7 +2419,8 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen) { struct mmc_command cmd = {0}; - if (mmc_card_blockaddr(card) || mmc_card_ddr52(card)) + if (mmc_card_blockaddr(card) || mmc_card_ddr52(card) || + mmc_card_hs400(card) || mmc_card_hs400es(card)) return 0; cmd.opcode = MMC_SET_BLOCKLEN;