summaryrefslogtreecommitdiff
path: root/drivers/mmc/card/block.c
diff options
context:
space:
mode:
authorNaveen Kumar Arepalli <naveenk@nvidia.com>2013-01-28 18:31:58 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:03:02 -0700
commita4433bf422303c6762c58cb282f90547afad4ff1 (patch)
treee1dc2edc176c5d2aa7de4c3acd2a80677ccd84ff /drivers/mmc/card/block.c
parent8c7db7ab45d38b65a4cb295be09d1acb2579b636 (diff)
Revert "mmc: block: Ignore mmc_blk_abort for out_of_range"
This reverts commit d188a339803f22e3c140fc51588e4d38dc93d01c. Bug 947965 Bug 1194300 Change-Id: I64b207664e469b7417fcfba699fdbfddfb889c49 Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com> Reviewed-on: http://git-master/r/194667 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/mmc/card/block.c')
-rw-r--r--drivers/mmc/card/block.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index ec05735110cd..b93a73c5980e 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1107,19 +1107,9 @@ static int mmc_blk_err_check(struct mmc_card *card,
* has been transferred.
*/
if (brq->cmd.resp[0] & CMD_ERRORS) {
- /*
- * As per SDA spec: "On CMD18 (multi read command)
- * when reading the last unprotected area block,
- * OUT_OF_RANGE error can occur this needs to be
- * ignored by the driver."
- */
- if (!((brq->cmd.resp[0] & R1_OUT_OF_RANGE) &&
- (brq->cmd.opcode == MMC_READ_MULTIPLE_BLOCK))) {
- pr_err("%s: r/w command failed, status = %#x\n",
- req->rq_disk->disk_name,
- brq->cmd.resp[0]);
- return MMC_BLK_ABORT;
- }
+ pr_err("%s: r/w command failed, status = %#x\n",
+ req->rq_disk->disk_name, brq->cmd.resp[0]);
+ return MMC_BLK_ABORT;
}
/*