diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-22 19:22:25 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-22 19:22:25 +0400 |
| commit | 42d1684c542ea1b4a7a356a0af1de4a80e1ecbdc (patch) | |
| tree | fb3664a72518a1e0839c990db90e80669b31dabd | |
| parent | 9ee82bc59dddcc316fbcf4b38f02c23071fb0198 (diff) | |
| parent | 0f0af9e6525d0067899f134d2e08f02ebb648c14 (diff) | |
Merge branch 'tracking-tracking-armlt-mmc' into merge-linux-linaro
| -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 b40e6052bd69..e775840d0830 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1062,6 +1062,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; } } @@ -1342,7 +1346,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; |