diff options
| author | Colin Cross <ccross@android.com> | 2011-01-27 16:12:58 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-02-11 14:03:52 -0800 |
| commit | 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4 (patch) | |
| tree | 0318f0b8fdaa6aa38cef80f2c5f38c343bd1967f /drivers | |
| parent | 5f2e1258ff35f700f5ca9df3047dc5fe19b99017 (diff) | |
Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
This reverts commit 2cdc235bbeb09b2b78cd02a94ab79c265861aea9.
The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.
This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.
Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f5b2aaf2371f..6909a54c39be 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -253,13 +253,8 @@ static int mmc_read_ext_csd(struct mmc_card *card) ext_csd[EXT_CSD_SEC_CNT + 3] << 24; /* Cards with density > 2GiB are sector addressed */ - if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) { - unsigned boot_sectors; - boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI]; - boot_sectors *= SZ_256K / 512; - card->ext_csd.sectors -= boot_sectors; + if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) mmc_card_set_blockaddr(card); - } } switch (ext_csd[EXT_CSD_CARD_TYPE] & EXT_CSD_CARD_TYPE_MASK) { |