e9688455f6
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37546
30 lines
920 B
Diff
30 lines
920 B
Diff
From 81d112d6c0e16fd0136ce2c5f511ba81ed1f23d2 Mon Sep 17 00:00:00 2001
|
|
From: Paul Cercueil <paul@crapouillou.net>
|
|
Date: Sun, 3 Jun 2012 13:07:19 +0200
|
|
Subject: [PATCH 05/16] MMC: JZ4740: Fix handling of read errors.
|
|
|
|
For no reason, the code handling write errors was implemented while
|
|
the code handling read errors was missing.
|
|
|
|
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
|
|
---
|
|
drivers/mmc/host/jz4740_mmc.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/drivers/mmc/host/jz4740_mmc.c
|
|
+++ b/drivers/mmc/host/jz4740_mmc.c
|
|
@@ -231,6 +231,14 @@ static void jz4740_mmc_transfer_check_st
|
|
host->req->cmd->error = -EIO;
|
|
data->error = -EIO;
|
|
}
|
|
+ } else if (status & JZ_MMC_STATUS_READ_ERROR_MASK) {
|
|
+ if (status & (JZ_MMC_STATUS_TIMEOUT_READ)) {
|
|
+ host->req->cmd->error = -ETIMEDOUT;
|
|
+ data->error = -ETIMEDOUT;
|
|
+ } else {
|
|
+ host->req->cmd->error = -EIO;
|
|
+ data->error = -EIO;
|
|
+ }
|
|
}
|
|
}
|
|
|