From 6226ca202a8f854b2f4e6c21e627a0e2bb001fec Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 18 Sep 2012 23:10:24 +0000 Subject: [PATCH] --- yaml --- r: 332845 b: refs/heads/master c: 7a7eb3286b8e078d6f5de56a2e26a3bb248085eb h: refs/heads/master i: 332843: a704c27bde429c24ccb885cb63d8915e95fbec59 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mmcif.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 12c099e0fd11..2059db6e2395 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 387a8cbdf84d5c417d24eabfdf9fe4e0b94458da +refs/heads/master: 7a7eb3286b8e078d6f5de56a2e26a3bb248085eb diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c index 5d8142773fac..6df3dc3164f7 100644 --- a/trunk/drivers/mmc/host/sh_mmcif.c +++ b/trunk/drivers/mmc/host/sh_mmcif.c @@ -1213,7 +1213,9 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id) sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_BUFRE); sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MBUFRE); } else if (state & INT_DTRANE) { - sh_mmcif_writel(host->addr, MMCIF_CE_INT, ~INT_DTRANE); + sh_mmcif_writel(host->addr, MMCIF_CE_INT, + ~(INT_CMD12DRE | INT_CMD12RBE | + INT_CMD12CRE | INT_DTRANE)); sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MDTRANE); } else if (state & INT_CMD12RBE) { sh_mmcif_writel(host->addr, MMCIF_CE_INT,