aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-07-18 18:59:52 +0100
committerJon Medhurst <tixy@linaro.org>2012-07-18 18:59:52 +0100
commit991ed865ac9a9d51b88b8a1a2dc6861b7663382d (patch)
tree463fc142decb8929820282298b4cdfc368c9ed38
parent9c672d8f1436a62707aa55b1e876222e6f943321 (diff)
parent11b92e44ba40b738a2cc31e467b5430a3a999b8e (diff)
downloadkernel-991ed865ac9a9d51b88b8a1a2dc6861b7663382d.tar.gz
Merge branch 'tracking-armlt-mmc' into integration-linux-vexpress
-rw-r--r--drivers/mmc/card/block.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 276d21c..e6bb680 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1068,6 +1068,10 @@ static int mmc_blk_err_check(struct mmc_card *card,
return MMC_BLK_ECC_ERR;
return MMC_BLK_DATA_ERR;
} else {
+ if (brq->data.blocks > 1) {
+ /* Hack to redo transfer one sector at a time */
+ return MMC_BLK_DATA_ERR;
+ }
return MMC_BLK_CMD_ERR;
}
}
@@ -1354,7 +1358,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
case MMC_BLK_ECC_ERR:
if (brq->data.blocks > 1) {
/* Redo read one sector at a time */
- pr_warning("%s: retrying using single block read\n",
+ pr_warning("%s: retrying using single block transfer\n",
req->rq_disk->disk_name);
disable_multi = 1;
break;