Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba2fa18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

parents 89a1623d 24117def

drivers/mmc/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/mmc/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */