aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/mmc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/core/mmc.c')
-rw-r--r--drivers/mmc/core/mmc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 5226ef8c0c2d..7c257c93ecd7 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -190,7 +190,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
190 190
191 *new_ext_csd = NULL; 191 *new_ext_csd = NULL;
192 192
193 if (card->csd.mmca_vsn < CSD_SPEC_VER_4) 193 if (!mmc_can_ext_csd(card))
194 return 0; 194 return 0;
195 195
196 /* 196 /*
@@ -852,7 +852,7 @@ static int mmc_select_powerclass(struct mmc_card *card)
852 int err, ddr; 852 int err, ddr;
853 853
854 /* Power class selection is supported for versions >= 4.0 */ 854 /* Power class selection is supported for versions >= 4.0 */
855 if (card->csd.mmca_vsn < CSD_SPEC_VER_4) 855 if (!mmc_can_ext_csd(card))
856 return 0; 856 return 0;
857 857
858 bus_width = host->ios.bus_width; 858 bus_width = host->ios.bus_width;
@@ -913,7 +913,7 @@ static int mmc_select_bus_width(struct mmc_card *card)
913 unsigned idx, bus_width = 0; 913 unsigned idx, bus_width = 0;
914 int err = 0; 914 int err = 0;
915 915
916 if ((card->csd.mmca_vsn < CSD_SPEC_VER_4) && 916 if (!mmc_can_ext_csd(card) &&
917 !(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) 917 !(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)))
918 return 0; 918 return 0;
919 919
@@ -1154,7 +1154,7 @@ static int mmc_select_timing(struct mmc_card *card)
1154{ 1154{
1155 int err = 0; 1155 int err = 0;
1156 1156
1157 if (card->csd.mmca_vsn < CSD_SPEC_VER_4) 1157 if (!mmc_can_ext_csd(card))
1158 goto bus_speed; 1158 goto bus_speed;
1159 1159
1160 if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200) 1160 if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)