mmc: fix mmc mode selection for HS-DDR and higher (f7414943) · Commits · e / devices / android_kernel_oneplus_sm8150

When IS_ERR_VALUE was removed from the mmc core code, it was replaced with a simple not-zero check. This does not work, as the value checked is the return value for mmc_select_bus_width, which returns the set bit width on success. This made eMMC modes higher than HS-DDR unusable. Fix this by checking for a positive return value instead. Fixes: ("remove lots of IS_ERR_VALUE abuses") Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Chen-Yu Tsai <wens@csie.org> Acked-by:

Hans de Goede <hdegoede@redhat.com> Reviewed-by:

Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by:

Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by:

Shawn Lin <shawn.lin@rock-chips.com> Tested-by:

Marcel Ziswiler <marcel.ziswiler@toradex.com> Tested-by:

Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/core/mmc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
	* switch to HS200 mode if bus width is set successfully.		* switch to HS200 mode if bus width is set successfully.
	*/		*/
	err = mmc_select_bus_width(card);		err = mmc_select_bus_width(card);
	if (!err) {		if (err >= 0) {
	val = EXT_CSD_TIMING_HS200 \|		val = EXT_CSD_TIMING_HS200 \|
	card->drive_strength << EXT_CSD_DRV_STR_SHIFT;		card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
	@@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
	} else if (mmc_card_hs(card)) {		} else if (mmc_card_hs(card)) {
	/* Select the desired bus width optionally */		/* Select the desired bus width optionally */
	err = mmc_select_bus_width(card);		err = mmc_select_bus_width(card);
	if (!err) {		if (err >= 0) {
	err = mmc_select_hs_ddr(card);		err = mmc_select_hs_ddr(card);
	if (err)		if (err)
	goto free_card;		goto free_card;