lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[051/107] mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

    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>

    ---
    drivers/mmc/host/tmio_mmc_pio.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- 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_ho
    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)



    \
     
     \ /
      Last update: 2011-07-08 07:09    [W:0.020 / U:2.656 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site