From 2edd3650da3453a8299d7c7b776732ba75c1d57d Mon Sep 17 00:00:00 2001 From: Seungwon Jeon Date: Wed, 25 Apr 2012 16:18:01 +0900 Subject: [PATCH] --- yaml --- r: 307955 b: refs/heads/master c: 10942aa40a595d7ff8b4e90f8a762e816367cac3 h: refs/heads/master i: 307953: 7dbe8772205f7329a8a95328a0e5f6c55474ac67 307951: bab495c72e6673b924b04f8b159a3c3e116f9296 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/mmc.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 64a54ba3c8c6..a6f4d220d8e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96cf5f02aee8bbeff38824b18b9ec583d687f846 +refs/heads/master: 10942aa40a595d7ff8b4e90f8a762e816367cac3 diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c index 0477769a8841..2a9b7b1a4801 100644 --- a/trunk/drivers/mmc/core/mmc.c +++ b/trunk/drivers/mmc/core/mmc.c @@ -728,7 +728,7 @@ static int mmc_select_powerclass(struct mmc_card *card, */ static int mmc_select_hs200(struct mmc_card *card) { - int idx, err = 0; + int idx, err = -EINVAL; struct mmc_host *host; static unsigned ext_csd_bits[] = { EXT_CSD_BUS_WIDTH_4, @@ -744,10 +744,12 @@ static int mmc_select_hs200(struct mmc_card *card) host = card->host; if (card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_2V && - host->caps2 & MMC_CAP2_HS200_1_2V_SDR) - if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0)) - err = mmc_set_signal_voltage(host, - MMC_SIGNAL_VOLTAGE_180, 0); + host->caps2 & MMC_CAP2_HS200_1_2V_SDR) + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0); + + if (err && card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_8V && + host->caps2 & MMC_CAP2_HS200_1_8V_SDR) + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, 0); /* If fails try again during next card power cycle */ if (err)