From: Colin Cross <ccross@android.com>
Date: Fri, 28 Jan 2011 00:12:55 +0000 (-0800)
Subject: Revert "mmc: fix non-arm build due to eMMC 4.3+ change"
X-Git-Tag: firefly_0821_release~9833^2~39^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f2e1258ff35f700f5ca9df3047dc5fe19b99017;p=firefly-linux-kernel-4.4.55.git

Revert "mmc: fix non-arm build due to eMMC 4.3+ change"

This reverts commit 1c119f2c1667ea2747693f7fd2166205e1a10b09.
---

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);
 		}