diff options
| author | Girish K S <girish.shivananjappa@linaro.org> | 2011-12-15 17:27:42 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 17:24:45 -0800 |
| commit | 1cfbbb9ba574157c9f2312d3267762fdde0bfc59 (patch) | |
| tree | 4ad35db7004c8c19c12ebc70da9b29b131f7342f /drivers/mmc/core/mmc.c | |
| parent | fcf53a1ed4225c1f23997ef02f2770a39e73c515 (diff) | |
| download | kernel_samsung_smdk4412-1cfbbb9ba574157c9f2312d3267762fdde0bfc59.zip kernel_samsung_smdk4412-1cfbbb9ba574157c9f2312d3267762fdde0bfc59.tar.gz kernel_samsung_smdk4412-1cfbbb9ba574157c9f2312d3267762fdde0bfc59.tar.bz2 | |
mmc: core: Fix voltage select in DDR mode
commit 913047e9e5787a90696533a9f109552b7694ecc9 upstream.
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -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 20b42c8..f601180 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -830,7 +830,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, * * WARNING: eMMC rules are NOT the same as SD DDR */ - if (ddr == EXT_CSD_CARD_TYPE_DDR_1_2V) { + if (ddr == MMC_1_2V_DDR_MODE) { err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0); if (err) |