diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-06-20 16:51:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 23:15:12 -0700 |
| commit | e58b733e71538e81705400c0aab8f17fa418e8e2 (patch) | |
| tree | 0c4b50ed7fe9cb2c019f615b12de8e2214c2194b | |
| parent | 3688f0cdb363affcbf24ba3cf2caa44ba02902a0 (diff) | |
| download | for-greg-e58b733e71538e81705400c0aab8f17fa418e8e2.tar.gz | |
mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
commit 7d8b4c2a4b73da8e3632603691838ca5b2a8c26d upstream.
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 710339a85c8467..b98196c9ce5abf 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -760,8 +760,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) |