|
@@ -1753,7 +1753,7 @@ void mmc_init_erase(struct mmc_card *card)
|
|
card->erase_shift = ffs(card->ssr.au) - 1;
|
|
card->erase_shift = ffs(card->ssr.au) - 1;
|
|
} else if (card->ext_csd.hc_erase_size) {
|
|
} else if (card->ext_csd.hc_erase_size) {
|
|
card->pref_erase = card->ext_csd.hc_erase_size;
|
|
card->pref_erase = card->ext_csd.hc_erase_size;
|
|
- } else {
|
|
|
|
|
|
+ } else if (card->erase_size) {
|
|
sz = (card->csd.capacity << (card->csd.read_blkbits - 9)) >> 11;
|
|
sz = (card->csd.capacity << (card->csd.read_blkbits - 9)) >> 11;
|
|
if (sz < 128)
|
|
if (sz < 128)
|
|
card->pref_erase = 512 * 1024 / 512;
|
|
card->pref_erase = 512 * 1024 / 512;
|
|
@@ -1770,7 +1770,8 @@ void mmc_init_erase(struct mmc_card *card)
|
|
if (sz)
|
|
if (sz)
|
|
card->pref_erase += card->erase_size - sz;
|
|
card->pref_erase += card->erase_size - sz;
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ } else
|
|
|
|
+ card->pref_erase = 0;
|
|
}
|
|
}
|
|
|
|
|
|
static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,
|
|
static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,
|