diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-13 00:35:25 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-13 00:35:25 +0400 |
| commit | 178b49453954811b98d5f98aa566807ff6211e68 (patch) | |
| tree | af7a0947d7885efb51df1fb8cae20a48774fab3d | |
| parent | c2028efde4ba69d53c1888f2790e18d9997b81ac (diff) | |
| parent | 9ab6f622068422b97278e55dd9689f2ce9a66661 (diff) | |
Merge branch 'tracking-previous-armlt-mmc' into merge-linux-linaro-tracking
| -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 9f3a51d4428d..4e75a54498e9 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1079,6 +1079,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; } } @@ -1355,7 +1359,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; |