[MMC] Fix protocol errors
authorPierre Ossman <drzeus@drzeus.cx>
Mon, 28 Nov 2005 21:00:29 +0000 (21:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Nov 2005 21:00:29 +0000 (21:00 +0000)
A review against MMC/SD specifications found some errors in the current
implementation.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/mmc/mmc.c
include/linux/mmc/protocol.h

index da528390acf87293292237abddf2bf5cf66b600c..d336a1d65dc7ec0ec165a62218840640207fdaf0 100644 (file)
@@ -816,7 +816,7 @@ static void mmc_discover_cards(struct mmc_host *host)
 
                        cmd.opcode = SD_SEND_RELATIVE_ADDR;
                        cmd.arg = 0;
-                       cmd.flags = MMC_RSP_R1;
+                       cmd.flags = MMC_RSP_R6;
 
                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                        if (err != MMC_ERR_NONE)
index f819cae92266aa2fdd889d7bbe9b6480828d9680..a14dc306545b86f2f353d4ab2022523264109a51 100644 (file)
@@ -63,7 +63,7 @@
   /* class 5 */
 #define MMC_ERASE_GROUP_START    35   /* ac   [31:0] data addr   R1  */
 #define MMC_ERASE_GROUP_END      36   /* ac   [31:0] data addr   R1  */
-#define MMC_ERASE                37   /* ac                      R1b */
+#define MMC_ERASE                38   /* ac                      R1b */
 
   /* class 9 */
 #define MMC_FAST_IO              39   /* ac   <Complex>          R4  */
@@ -74,7 +74,7 @@
 
   /* class 8 */
 #define MMC_APP_CMD              55   /* ac   [31:16] RCA        R1  */
-#define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1b */
+#define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1  */
 
 /* SD commands                           type  argument     response */
   /* class 8 */