summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-01-27 16:12:55 -0800
committerColin Cross <ccross@android.com>2011-02-11 13:54:41 -0800
commit5f2e1258ff35f700f5ca9df3047dc5fe19b99017 (patch)
treebda9cc15666cf7fd2f5f9c1d3d490b2c9bd94679 /drivers
parent6b825e9aaa011f01e433c57db9f191cb99f30709 (diff)
Revert "mmc: fix non-arm build due to eMMC 4.3+ change"
This reverts commit 1c119f2c1667ea2747693f7fd2166205e1a10b09.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 45055c46d954..f5b2aaf2371f 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -255,8 +255,8 @@ static int mmc_read_ext_csd(struct mmc_card *card)
/* Cards with density > 2GiB are sector addressed */
if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) {
unsigned boot_sectors;
- /* size is in 256K chunks, i.e. 512 sectors each */
- boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI] * 512;
+ boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI];
+ boot_sectors *= SZ_256K / 512;
card->ext_csd.sectors -= boot_sectors;
mmc_card_set_blockaddr(card);
}