From 97b7bbc9ea362c666ceb10f4a739aa9ff891df69 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Fri, 31 Oct 2014 09:46:20 +0530 Subject: [PATCH] mmc: core: Fix error handling of MMC_BLK_DATA_ERR Avoid retrying using single block for read commands that fail with MMC_BLK_DATA_ERR. The single block read retry is needed only in case of a CRC error for which MMC_BLK_ECC_ERR will be set anyway by mmc_blk_err_check(). Change-Id: Iec9487fd73ecf2bdd5e62732cd42cdb3a639d0dc Signed-off-by: Sahitya Tummala --- drivers/mmc/card/block.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 9ad1cfded1b6..d64d7bfd08c2 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2029,10 +2029,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) err = mmc_blk_reset(md, card->host, type); if (!err) break; - if (err == -ENODEV || - mmc_packed_cmd(mq_rq->cmd_type)) - goto cmd_abort; - /* Fall through */ + goto cmd_abort; } case MMC_BLK_ECC_ERR: if (brq->data.blocks > 1) {