diff options
| author | Girish K S <girish.shivananjappa@linaro.org> | 2011-12-15 06:57:42 -0500 |
|---|---|---|
| committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2012-02-13 15:14:54 -0500 |
| commit | 817504645adb80c64c966254a0fa31cfcad2e6fe (patch) | |
| tree | 5ea6780acfb79aeea5c382d4edd848788503e423 /drivers/mmc/core | |
| parent | 4eed72893c7f208e69b8ceb8bfb0ec42eb7c05da (diff) | |
mmc: core: Fix voltage select in DDR mode
BugLink: http://bugs.launchpad.net/bugs/922799
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')
| -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 20b42c835ab..f6011802745 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, | |||
| 830 | * | 830 | * |
| 831 | * WARNING: eMMC rules are NOT the same as SD DDR | 831 | * WARNING: eMMC rules are NOT the same as SD DDR |
| 832 | */ | 832 | */ |
| 833 | if (ddr == EXT_CSD_CARD_TYPE_DDR_1_2V) { | 833 | if (ddr == MMC_1_2V_DDR_MODE) { |
| 834 | err = mmc_set_signal_voltage(host, | 834 | err = mmc_set_signal_voltage(host, |
| 835 | MMC_SIGNAL_VOLTAGE_120, 0); | 835 | MMC_SIGNAL_VOLTAGE_120, 0); |
| 836 | if (err) | 836 | if (err) |
