summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2011-02-14 16:41:15 +0530
committerNitin Kumbhar <nkumbhar@nvidia.com>2011-02-14 16:41:15 +0530
commitf5bbafdde1f0d270bf80d8ed2a888f51fdb9e3ab (patch)
treec8bff0e59935c50935b6cfbe0492df05a82c31e5 /drivers
parentc4015fe57a590f21a9729fff9a3da23e23412f68 (diff)
Revert "Revert "mmc: fix non-arm build due to eMMC 4.3+ change""
This reverts commit 5f2e1258ff35f700f5ca9df3047dc5fe19b99017.
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 f5b2aaf2371f..45055c46d954 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;
- boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI];
- boot_sectors *= SZ_256K / 512;
+ /* size is in 256K chunks, i.e. 512 sectors each */
+ boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI] * 512;
card->ext_csd.sectors -= boot_sectors;
mmc_card_set_blockaddr(card);
}