From 4697ef9d3eeb5405041c40cc8cfcabb244dfdea2 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 20 Jun 2011 16:51:10 +0200 Subject: [PATCH] --- yaml --- r: 254087 b: refs/heads/master c: 7d8b4c2a4b73da8e3632603691838ca5b2a8c26d h: refs/heads/master i: 254085: 5b3f524dfa210f442830dd0fbc057007b89b98a9 254083: b1e253f410026aa0d6c148f8549a152fb709861b 254079: c1f20724e61b5700d503c3a909df9e096e1da3be v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/tmio_mmc_pio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8906fe4ea15f..653ce83df348 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9120c33ffbb0b3448d833dae392edc90d6cfac2 +refs/heads/master: 7d8b4c2a4b73da8e3632603691838ca5b2a8c26d diff --git a/trunk/drivers/mmc/host/tmio_mmc_pio.c b/trunk/drivers/mmc/host/tmio_mmc_pio.c index ad6347bb02dd..0b09e8239aa0 100644 --- a/trunk/drivers/mmc/host/tmio_mmc_pio.c +++ b/trunk/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)