From 9267de21e1da6070e17223184f1dd6ade84f368f Mon Sep 17 00:00:00 2001 From: Seungwon Jeon Date: Tue, 25 Oct 2011 09:43:12 +0900 Subject: [PATCH] --- yaml --- r: 270308 b: refs/heads/master c: 336c716ae2272c9a26a6f82976d0e077d8ca824e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/mmc.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c787419b5ff9..cb027e57c656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b68256cdef75204aa8a4583aa79dd7c081796b3 +refs/heads/master: 336c716ae2272c9a26a6f82976d0e077d8ca824e diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c index fb5bf01dd1b2..36270449dd9d 100644 --- a/trunk/drivers/mmc/core/mmc.c +++ b/trunk/drivers/mmc/core/mmc.c @@ -467,29 +467,27 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) card->ext_csd.rst_n_function = ext_csd[EXT_CSD_RST_N_FUNCTION]; } - /* eMMC v4.5 or later */ - if (card->ext_csd.rev >= 6) - card->ext_csd.feature_support |= MMC_DISCARD_FEATURE; - card->ext_csd.raw_erased_mem_count = ext_csd[EXT_CSD_ERASED_MEM_CONT]; if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) card->erased_byte = 0xFF; else card->erased_byte = 0x0; + /* eMMC v4.5 or later */ if (card->ext_csd.rev >= 6) { + card->ext_csd.feature_support |= MMC_DISCARD_FEATURE; + card->ext_csd.generic_cmd6_time = 10 * ext_csd[EXT_CSD_GENERIC_CMD6_TIME]; card->ext_csd.power_off_longtime = 10 * ext_csd[EXT_CSD_POWER_OFF_LONG_TIME]; - } else - card->ext_csd.generic_cmd6_time = 0; - card->ext_csd.cache_size = - ext_csd[EXT_CSD_CACHE_SIZE + 0] << 0 | - ext_csd[EXT_CSD_CACHE_SIZE + 1] << 8 | - ext_csd[EXT_CSD_CACHE_SIZE + 2] << 16 | - ext_csd[EXT_CSD_CACHE_SIZE + 3] << 24; + card->ext_csd.cache_size = + ext_csd[EXT_CSD_CACHE_SIZE + 0] << 0 | + ext_csd[EXT_CSD_CACHE_SIZE + 1] << 8 | + ext_csd[EXT_CSD_CACHE_SIZE + 2] << 16 | + ext_csd[EXT_CSD_CACHE_SIZE + 3] << 24; + } out: return err;