aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/core/sdio.c2
-rw-r--r--include/linux/mmc/sdio.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 925bab052b0..3ab565e32a6 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -111,7 +111,7 @@ static int sdio_read_cccr(struct mmc_card *card)
111 111
112 cccr_vsn = data & 0x0f; 112 cccr_vsn = data & 0x0f;
113 113
114 if (cccr_vsn > SDIO_CCCR_REV_1_20) { 114 if (cccr_vsn > SDIO_CCCR_REV_3_00) {
115 pr_err("%s: unrecognised CCCR structure version %d\n", 115 pr_err("%s: unrecognised CCCR structure version %d\n",
116 mmc_hostname(card->host), cccr_vsn); 116 mmc_hostname(card->host), cccr_vsn);
117 return -EINVAL; 117 return -EINVAL;
diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
index 2a2e9905a24..e0b1123497b 100644
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@ -72,11 +72,13 @@
72#define SDIO_CCCR_REV_1_00 0 /* CCCR/FBR Version 1.00 */ 72#define SDIO_CCCR_REV_1_00 0 /* CCCR/FBR Version 1.00 */
73#define SDIO_CCCR_REV_1_10 1 /* CCCR/FBR Version 1.10 */ 73#define SDIO_CCCR_REV_1_10 1 /* CCCR/FBR Version 1.10 */
74#define SDIO_CCCR_REV_1_20 2 /* CCCR/FBR Version 1.20 */ 74#define SDIO_CCCR_REV_1_20 2 /* CCCR/FBR Version 1.20 */
75#define SDIO_CCCR_REV_3_00 3 /* CCCR/FBR Version 3.00 */
75 76
76#define SDIO_SDIO_REV_1_00 0 /* SDIO Spec Version 1.00 */ 77#define SDIO_SDIO_REV_1_00 0 /* SDIO Spec Version 1.00 */
77#define SDIO_SDIO_REV_1_10 1 /* SDIO Spec Version 1.10 */ 78#define SDIO_SDIO_REV_1_10 1 /* SDIO Spec Version 1.10 */
78#define SDIO_SDIO_REV_1_20 2 /* SDIO Spec Version 1.20 */ 79#define SDIO_SDIO_REV_1_20 2 /* SDIO Spec Version 1.20 */
79#define SDIO_SDIO_REV_2_00 3 /* SDIO Spec Version 2.00 */ 80#define SDIO_SDIO_REV_2_00 3 /* SDIO Spec Version 2.00 */
81#define SDIO_SDIO_REV_3_00 4 /* SDIO Spec Version 3.00 */
80 82
81#define SDIO_CCCR_SD 0x01 83#define SDIO_CCCR_SD 0x01
82 84