Commit 9e80f489 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents aa8c8cd0 e9233917

drivers/mmc/core/sd.c

+2 −1
Original line number Diff line number Diff line
@@ -870,7 +870,8 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) 
	 * 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--;