aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/mmc.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-12-26 09:25:58 -0500
committerPierre Ossman <drzeus@drzeus.cx>2007-05-01 07:04:16 -0400
commit9c2c0af950345e63ef86f28eca44333a1e1e709b (patch)
tree9c47e48f1c185610d704434ee710e21c5939b493 /drivers/mmc/mmc.c
parent85a18ad93ec66888d85758630019b10a84257f3c (diff)
mmc: add type field to cards
Split out the type of card into its own field as it hardly qualifies as a state. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/mmc.c')
-rw-r--r--drivers/mmc/mmc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f772df93a398..ccd3037da249 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -980,7 +980,7 @@ static void mmc_discover_cards(struct mmc_host *host)
980 card->state &= ~MMC_STATE_DEAD; 980 card->state &= ~MMC_STATE_DEAD;
981 981
982 if (host->mode == MMC_MODE_SD) { 982 if (host->mode == MMC_MODE_SD) {
983 mmc_card_set_sd(card); 983 card->type = MMC_TYPE_SD;
984 984
985 cmd.opcode = SD_SEND_RELATIVE_ADDR; 985 cmd.opcode = SD_SEND_RELATIVE_ADDR;
986 cmd.arg = 0; 986 cmd.arg = 0;
@@ -1003,6 +1003,7 @@ static void mmc_discover_cards(struct mmc_host *host)
1003 } 1003 }
1004 } 1004 }
1005 } else { 1005 } else {
1006 card->type = MMC_TYPE_MMC;
1006 cmd.opcode = MMC_SET_RELATIVE_ADDR; 1007 cmd.opcode = MMC_SET_RELATIVE_ADDR;
1007 cmd.arg = card->rca << 16; 1008 cmd.arg = card->rca << 16;
1008 cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; 1009 cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;