summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2010-07-27 23:11:15 -0500
committerColin Cross <ccross@android.com>2010-10-06 16:28:10 -0700
commit1c119f2c1667ea2747693f7fd2166205e1a10b09 (patch)
treee3f718a359d8816c3482284a6b1f621afb3c378d /drivers/mmc
parent03b85005e5dc138baa22e91e9f8f3af5d610ef0e (diff)
mmc: fix non-arm build due to eMMC 4.3+ change
drivers/mmc/core/mmc.c:228: error: ‘SZ_256K’ undeclared (first use in this function) Introduced by: mmc: subtract boot sectors from disk size for eMMC 4.3+ devices (SZ_* doesn't exist on anything but arm) Change-Id: I981217adea4ef56bf870562b6711488f3f4bf830 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mmc')
-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);
}