| commit | 1426a293bd8eac32fcabce6872ba54c49255d9f3 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Dec 04 23:28:32 2012 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Dec 04 23:28:30 2012 -0800 |
| tree | cb8e1c7361123e3f4abff3a7651c536efc39e444 | |
| parent | 601c55e594dd2b5b599b296c547193c046f8fc10 [diff] | |
| parent | 9a87427db940047907aee0dc86965645656f1ca9 [diff] |
Merge "mmc: card: fix timeout on erase/trim command due to sanitize"
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index ae68060..d2a5836 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c
@@ -1022,9 +1022,6 @@ goto out; } - if (mmc_can_sanitize(card)) - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_SANITIZE_START, 1, 0); out_retry: if (err && !mmc_blk_reset(md, card->host, type)) goto retry;