diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 08:48:16 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 08:48:16 (GMT) |
| commit | c96a9876696d30783ad54399351a0bf3660db53f (patch) | |
| tree | 74daba0ed1fd2838e8eb527c4f7fe5262ee979bd /drivers/mmc/host/of_mmc_spi.c | |
| parent | d1f42e314c9c50541c79a6edf2b4cab63fe02ee3 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | linux-fsl-qoriq-c96a9876696d30783ad54399351a0bf3660db53f.tar.xz | |
Merge tag 'v3.3-rc7' into x86/platform
Merge reason: Update to the almost-final v3.3 kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mmc/host/of_mmc_spi.c')
| -rw-r--r-- | drivers/mmc/host/of_mmc_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c index ab66f24..1534b58 100644 --- a/drivers/mmc/host/of_mmc_spi.c +++ b/drivers/mmc/host/of_mmc_spi.c @@ -113,8 +113,8 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi) const int j = i * 2; u32 mask; - mask = mmc_vddrange_to_ocrmask(voltage_ranges[j], - voltage_ranges[j + 1]); + mask = mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]), + be32_to_cpu(voltage_ranges[j + 1])); if (!mask) { ret = -EINVAL; dev_err(dev, "OF: voltage-range #%d is invalid\n", i); |