From 024c2afa8cb8ff4a637403ac3439c3d67eb9c024 Mon Sep 17 00:00:00 2001 From: Yaniv Gardi Date: Tue, 4 Dec 2012 16:42:58 +0200 Subject: [PATCH] mmc: card: fix timeout on erase/trim command due to sanitize Sanitize command should never be issued with timeout argument of 0, cause then it invokes timeout. Moreover, sanitize command should not be called from routines that does erase/trim/secure-discard commands, but only from a routine that issues the sanitize spesifically.(mmc_blk_issue_sanitize_rq) Change-Id: Ia3e3737f4bad149edc2248b8a30d74a9bd812be1 Signed-off-by: Yaniv Gardi (cherry picked from commit 9a87427db940047907aee0dc86965645656f1ca9) Signed-off-by: Neha Pandey --- drivers/mmc/card/block.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 6491e4ef02c..bac9f3dec2c 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1002,9 +1002,6 @@ retry: 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;