| Message ID | Pine.LNX.4.64.1106201648480.11365@axis700.grange (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hi, On Mon, Jun 20 2011, Guennadi Liakhovetski wrote: > Commit b6147490e6aac82fa2f4b9d7fce925d9891ebe8f broke handling of the > TMIO_MMC_WRPROTECT_DISABLE flag by the tmio-mmc driver. This patch > restores the original behaviour. Changed to: 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. Please use patch names as well as commit IDs for references. > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > > Chris, please push for 3.0 And stable@, presumably, since the patch was in 2.6.39? Pushed to mmc-next for 3.0 and stable. Thanks, - Chris.
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index ad6347b..0b09e82 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)
Commit b6147490e6aac82fa2f4b9d7fce925d9891ebe8f 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> --- Chris, please push for 3.0 Thanks Guennadi drivers/mmc/host/tmio_mmc_pio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)