aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-05-19 10:14:43 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-07-09 15:28:09 -0400
commit8c75deae1ab99661975da098f8b721bafbb247c4 (patch)
tree5eb748d34801bc6ae08fdd976d40e290f694aa0a
parentffce2e7e7060c949ccd703dacc9b3dd81b377373 (diff)
mmc: fix silly copy-and-paste error
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/core/mmc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e4371555160a..66f85bfa8dbb 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -237,7 +237,7 @@ out:
237 * In the case of a resume, "curcard" will contain the card 237 * In the case of a resume, "curcard" will contain the card
238 * we're trying to reinitialise. 238 * we're trying to reinitialise.
239 */ 239 */
240static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 240static int mmc_init_card(struct mmc_host *host, u32 ocr,
241 struct mmc_card *oldcard) 241 struct mmc_card *oldcard)
242{ 242{
243 struct mmc_card *card; 243 struct mmc_card *card;
@@ -500,7 +500,7 @@ static void mmc_resume(struct mmc_host *host)
500 500
501 mmc_claim_host(host); 501 mmc_claim_host(host);
502 502
503 err = mmc_sd_init_card(host, host->ocr, host->card); 503 err = mmc_init_card(host, host->ocr, host->card);
504 if (err != MMC_ERR_NONE) { 504 if (err != MMC_ERR_NONE) {
505 mmc_remove(host); 505 mmc_remove(host);
506 mmc_detach_bus(host); 506 mmc_detach_bus(host);
@@ -559,7 +559,7 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
559 /* 559 /*
560 * Detect and init the card. 560 * Detect and init the card.
561 */ 561 */
562 err = mmc_sd_init_card(host, host->ocr, NULL); 562 err = mmc_init_card(host, host->ocr, NULL);
563 if (err != MMC_ERR_NONE) 563 if (err != MMC_ERR_NONE)
564 goto err; 564 goto err;
565 565