diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-06-20 16:51:10 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-06-26 00:52:15 +0200 |
| commit | 7d8b4c2a4b73da8e3632603691838ca5b2a8c26d (patch) | |
| tree | c9f4bf96c6250ebb72b6c30936d7f06a10e3382c /drivers/mmc/host/tmio_mmc_pio.c | |
| parent | mmc: omap_hsmmc: use original sg_len for dma_unmap_sg (diff) | |
| download | linux-7d8b4c2a4b73da8e3632603691838ca5b2a8c26d.tar.xz linux-7d8b4c2a4b73da8e3632603691838ca5b2a8c26d.zip | |
mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
Commit b6147490e6aac82 ("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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/tmio_mmc_pio.c')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index ad6347bb02dd..0b09e8239aa0 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -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) |