summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-12-26 15:25:58 +0100
committerPierre Ossman <drzeus@drzeus.cx>2007-05-01 13:04:16 +0200
commit9c2c0af950345e63ef86f28eca44333a1e1e709b (patch)
tree9c47e48f1c185610d704434ee710e21c5939b493 /drivers/mmc
parent85a18ad93ec66888d85758630019b10a84257f3c (diff)
downloadkernel-crypto-9c2c0af950345e63ef86f28eca44333a1e1e709b.tar.gz
kernel-crypto-9c2c0af950345e63ef86f28eca44333a1e1e709b.tar.xz
kernel-crypto-9c2c0af950345e63ef86f28eca44333a1e1e709b.zip
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')
-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 f772df93a39..ccd3037da24 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -980,7 +980,7 @@ static void mmc_discover_cards(struct mmc_host *host)
card->state &= ~MMC_STATE_DEAD;
if (host->mode == MMC_MODE_SD) {
- mmc_card_set_sd(card);
+ card->type = MMC_TYPE_SD;
cmd.opcode = SD_SEND_RELATIVE_ADDR;
cmd.arg = 0;
@@ -1003,6 +1003,7 @@ static void mmc_discover_cards(struct mmc_host *host)
}
}
} else {
+ card->type = MMC_TYPE_MMC;
cmd.opcode = MMC_SET_RELATIVE_ADDR;
cmd.arg = card->rca << 16;
cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;