diff options
| author | Colin Cross <ccross@android.com> | 2011-04-18 19:15:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-04-18 19:15:25 -0700 |
| commit | b229edf63c7145472b6784d881aa5a55c248bbc9 (patch) | |
| tree | f5685dc788e7cb4e21e321c81e87ff1c5499f5a4 | |
| parent | 11fa8645eacfacbb38b40a62000f23afae659884 (diff) | |
| parent | 39455fe0d831457ecdd91ca43e444bf9b6fb5ae2 (diff) | |
| download | pandroid-android-omap-2.6.39.tar.gz | |
Merge branch 'android-2.6.39' into android-omap-2.6.39android-omap-2.6.39
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 | ||||
| -rw-r--r-- | include/linux/mmc/mmc.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 7c6705202c9..14e95f39a7b 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; - /* 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; + 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) { diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index ea8cda4c58f..264ba5451e3 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -271,7 +271,6 @@ struct _mmc_csd { #define EXT_CSD_SEC_ERASE_MULT 230 /* RO */ #define EXT_CSD_SEC_FEATURE_SUPPORT 231 /* RO */ #define EXT_CSD_TRIM_MULT 232 /* RO */ -#define EXT_CSD_BOOT_SIZE_MULTI 226 /* RO */ /* * EXT_CSD field definitions |