summaryrefslogtreecommitdiff
path: root/drivers/mmc/mxcmmc.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-08-05 09:15:55 -0400
committerTom Rini <trini@konsulko.com>2016-08-05 20:55:27 -0400
commita60d94b204412732409e70cb15236bd96d4da7d9 (patch)
tree4eb4d5b6b0783a6b244625109a724185c1b64a78 /drivers/mmc/mxcmmc.c
parentd03a0308599bb658598848e86aadb0d140f65e0c (diff)
parent89f69e51734f5d704ef84503d24907bfde2f5577 (diff)
downloadu-boot-imx-a60d94b204412732409e70cb15236bd96d4da7d9.zip
u-boot-imx-a60d94b204412732409e70cb15236bd96d4da7d9.tar.gz
u-boot-imx-a60d94b204412732409e70cb15236bd96d4da7d9.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/mxcmmc.c')
-rw-r--r--drivers/mmc/mxcmmc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 561b204..8038f90 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -211,11 +211,11 @@ static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat)
} else if (stat & STATUS_CRC_WRITE_ERR) {
u32 err_code = (stat >> 9) & 0x3;
if (err_code == 2) /* No CRC response */
- data_error = TIMEOUT;
+ data_error = -ETIMEDOUT;
else
data_error = -EILSEQ;
} else if (stat & STATUS_TIME_OUT_READ) {
- data_error = TIMEOUT;
+ data_error = -ETIMEDOUT;
} else {
data_error = -EIO;
}
@@ -238,7 +238,7 @@ static int mxcmci_read_response(struct mxcmci_host *host, unsigned int stat)
if (stat & STATUS_TIME_OUT_RESP) {
printf("CMD TIMEOUT\n");
- return TIMEOUT;
+ return -ETIMEDOUT;
} else if (stat & STATUS_RESP_CRC_ERR && cmd->resp_type & MMC_RSP_CRC) {
printf("cmd crc error\n");
return -EILSEQ;