diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-11-20 17:29:39 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-11-20 17:29:39 +0300 |
| commit | b3c39b1a96a67a7e246d562f44d04ce6f9ef878f (patch) | |
| tree | 6874debfde448db313bd7c53c3aca59687038c1f /drivers/mmc/core/core.c | |
| parent | 63a3bf5e8d9e79ce456c8f73d4395a5a51d841b1 (diff) | |
| parent | 77c51ba552a1c4f73228766e43ae37c4101b3758 (diff) | |
| download | linux-b3c39b1a96a67a7e246d562f44d04ce6f9ef878f.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and check if libraries used that comes from other trees
continue to work with tools/perf, such as tools/lib/bpf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 95fa8fb1d45f..c5de202f530a 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1134,7 +1134,13 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) mmc_power_cycle(host, ocr); } else { bit = fls(ocr) - 1; - ocr &= 3 << bit; + /* + * The bit variable represents the highest voltage bit set in + * the OCR register. + * To keep a range of 2 values (e.g. 3.2V/3.3V and 3.3V/3.4V), + * we must shift the mask '3' with (bit - 1). + */ + ocr &= 3 << (bit - 1); if (bit != host->ios.vdd) dev_warn(mmc_dev(host), "exceeding card's volts\n"); } |