diff options
| author | Colin Cross <ccross@android.com> | 2011-02-12 14:13:19 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-02-12 14:13:19 -0800 |
| commit | 87666eb18a15ffecfbd6108a9e2cb0d54e33ec99 (patch) | |
| tree | ca3cdf277886299212f52471dcae6fa9b683802e /drivers/mmc | |
| parent | fd4194e5c3ab51f0eacdc115eeead02dbf8f4d88 (diff) | |
| parent | 1cd64ef5c1becb1c70c432bdcae98fdb686a8173 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 45055c46d954..6909a54c39be 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) { |