diff options
author | Girish K S <girish.shivananjappa@linaro.org> | 2011-12-15 06:57:42 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-01-11 23:58:45 -0500 |
commit | 913047e9e5787a90696533a9f109552b7694ecc9 (patch) | |
tree | 34391f25cb71bdd4abbaa8fe478f47dec3910b3f /drivers/mmc | |
parent | 7003fecbf0c9f7dde75d93ba75e0cb7ddb662749 (diff) |
mmc: core: Fix voltage select in DDR mode
This patch fixes the wrong comparison before setting the interface
voltage in DDR mode.
The assignment to the variable ddr before comaprison is either
ddr = MMC_1_2V_DDR_MODE; or ddr == MMC_1_8V_DDR_MODE. But the comparison
is done with the extended csd value if ddr == EXT_CSD_CARD_TYPE_DDR_1_2V.
Signed-off-by: Girish K S <girish.shivananjappa@linaro.org>
Acked-by: Subhash Jadavani <subhashj@codeaurora.org>
Acked-by: Philip Rakity <prakity@marvell.com>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 006e932a3ae3..f0a9f1fbd1f6 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -1058,7 +1058,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, | |||
1058 | * | 1058 | * |
1059 | * WARNING: eMMC rules are NOT the same as SD DDR | 1059 | * WARNING: eMMC rules are NOT the same as SD DDR |
1060 | */ | 1060 | */ |
1061 | if (ddr == EXT_CSD_CARD_TYPE_DDR_1_2V) { | 1061 | if (ddr == MMC_1_2V_DDR_MODE) { |
1062 | err = mmc_set_signal_voltage(host, | 1062 | err = mmc_set_signal_voltage(host, |
1063 | MMC_SIGNAL_VOLTAGE_120, 0); | 1063 | MMC_SIGNAL_VOLTAGE_120, 0); |
1064 | if (err) | 1064 | if (err) |