diff options
author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:39 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:39 +0100 |
commit | c28abb089f55b56218b33c1057e33952b3278083 (patch) | |
tree | b71b31cb10dba6c7238d3b75f23d4285361a1ea6 /drivers | |
parent | 1c1e138084ae5d51c9c13addbef6716b7ff22b92 (diff) | |
parent | c4df4494bcc3b1a4d71e1a837063f5e96f2c6f73 (diff) |
Merge branch 'tracking-armlt-mmc' into lsk-3.9-vexpress
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/card/block.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 5bab73b91c2..41b1aff5334 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1156,6 +1156,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; } } @@ -1808,7 +1812,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; |