diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2022-09-21 14:44:41 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2022-09-21 14:44:41 +0200 |
| commit | 9e80f489478cba609d811431b1693bb9ff5b6739 (patch) | |
| tree | f3b116562bc5b44ffeb0a552e497b905265bd9f5 /drivers/mmc/core | |
| parent | aa8c8cd047467d4573ce042a76ba74191ddda7b4 (diff) | |
| parent | e9233917a7e53980664efbc565888163c0a33c3f (diff) | |
| download | linux-9e80f489478cba609d811431b1693bb9ff5b6739.tar.bz2 | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.0rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.1.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/sd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 06aa62ce0ed1..3662bf5320ce 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -870,7 +870,8 @@ try_again: * the CCS bit is set as well. We deliberately deviate from the spec in * regards to this, which allows UHS-I to be supported for SDSC cards. */ - if (!mmc_host_is_spi(host) && rocr && (*rocr & SD_ROCR_S18A)) { + if (!mmc_host_is_spi(host) && (ocr & SD_OCR_S18R) && + rocr && (*rocr & SD_ROCR_S18A)) { err = mmc_set_uhs_voltage(host, pocr); if (err == -EAGAIN) { retries--; |