Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b74e7bc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Correct the checks while setting clock scaling frequencies"

parents e8e1386e 6720af38

drivers/mmc/core/mmc.c

+4 −4
Original line number Diff line number Diff line
@@ -2159,11 +2159,11 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	}



	card->clk_scaling_lowest = host->f_min;

	if ((card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS400) ||

			(card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS200))

	if ((card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400) ||

			(card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200))

		card->clk_scaling_highest = card->ext_csd.hs200_max_dtr;

	else if ((card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS) ||

			(card->mmc_avail_type | EXT_CSD_CARD_TYPE_DDR_52))

	else if ((card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS) ||

			(card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_52))

		card->clk_scaling_highest = card->ext_csd.hs_max_dtr;

	else

		card->clk_scaling_highest = card->csd.max_dtr;