diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-31 10:33:14 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-31 10:33:14 -0500 |
| commit | 3d67102510d640afd83212882e39d3f6ce1e7b14 (patch) | |
| tree | 357cd1122bac08eeb0690b42a32a2576dd444682 | |
| parent | 320ea175f47fe6c6acc59fce68cbe1e63a91fd9e (diff) | |
Fix merge error
Changes to be committed:
modified: include/linux/mmc/core.h
| -rw-r--r-- | include/linux/mmc/core.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 6ce5c4218fe8..c163cec21854 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -58,19 +58,12 @@ struct mmc_command { unsigned int retries; /* max number of retries */ unsigned int error; /* command error */ -/* - * Standard errno values are used for errors, but some have specific - * meaning in the MMC layer: - * - * ETIMEDOUT Card took too long to respond - * EILSEQ Basic format problem with the received or sent data - * (e.g. CRC check failed, incorrect opcode in response - * or bad end bit) - * EINVAL Request cannot be performed because of restrictions - * in hardware and/or the driver - * ENOMEDIUM Host can determine that the slot is empty and is - * actively failing requests - */ +#define MMC_ERR_NONE 0 +#define MMC_ERR_TIMEOUT 1 +#define MMC_ERR_BADCRC 2 +#define MMC_ERR_FIFO 3 +#define MMC_ERR_FAILED 4 +#define MMC_ERR_INVALID 5 struct mmc_data *data; /* data segment associated with cmd */ struct mmc_request *mrq; /* associated request */ |