diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-16 12:06:15 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:31 -0400 |
| commit | 726d6f2374410d980341bfeb49399614e689e702 (patch) | |
| tree | 5bf34c9ed06f802ef468a0af8cfb945ff0f7fe70 /drivers/mmc/core/core.c | |
| parent | ce69d37b7d8fa692c45d71d94aa0c921859b82ce (diff) | |
| download | op-kernel-dev-726d6f2374410d980341bfeb49399614e689e702.zip op-kernel-dev-726d6f2374410d980341bfeb49399614e689e702.tar.gz | |
mmc: core: Collect common code for card ocr validation
Since mmc_select_voltage now only gets called from the attach sequence,
it makes sense to move the out of spec validations of the card ocr into
this function.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 63672ab..bcb5077 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1357,6 +1357,16 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) { int bit; + /* + * Sanity check the voltages that the card claims to + * support. + */ + if (ocr & 0x7F) { + dev_warn(mmc_dev(host), + "card claims to support voltages below defined range\n"); + ocr &= ~0x7F; + } + ocr &= host->ocr_avail; if (!ocr) { dev_warn(mmc_dev(host), "no support for card's volts\n"); |
