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

Commit 7d8b4c2a authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling 



Commit b6147490 ("mmc: tmio: split core functionality, DMA and
MFD glue") broke handling of the TMIO_MMC_WRPROTECT_DISABLE flag by
the tmio-mmc driver. This patch restores the original behaviour.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent a9120c33

drivers/mmc/host/tmio_mmc_pio.c

+2 −2
Original line number Diff line number Diff line
@@ -824,8 +824,8 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc) 
	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct tmio_mmc_data *pdata = host->pdata;



	return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||

		!(sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));

	return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||

		 (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));

}



static int tmio_mmc_get_cd(struct mmc_host *mmc)