From: lintao <lintao@rock-chips.com>
Date: Tue, 9 Sep 2014 09:38:40 +0000 (+0800)
Subject: mmc: guarantee  atomic access INTMASK register for sdio_irq_thread
X-Git-Tag: firefly_0821_release~4734
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=007547889dc24cd3824a3b77e0281d0268e058c1;p=firefly-linux-kernel-4.4.55.git

mmc: guarantee  atomic access INTMASK register for sdio_irq_thread
---

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 4db50856b0da..586b91479e3a 100755
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -701,10 +701,11 @@ err_exit:
 
 static void dw_mci_edmac_exit(struct dw_mci *host)
 {
-        dma_release_channel(host->dms->ch);
-        host->dms->ch = NULL;
-
         if (NULL != host->dms) {
+                if (NULL != host->dms->ch) {
+                        dma_release_channel(host->dms->ch);
+                        host->dms->ch = NULL;
+                }
                 kfree(host->dms);
                 host->dms = NULL;
         }
@@ -1696,6 +1697,8 @@ static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb)
 	u32 int_mask;
 	u32 sdio_int;
 
+        spin_lock_bh(&host->lock);
+
 	/* Enable/disable Slot Specific SDIO interrupt */
 	int_mask = mci_readl(host, INTMASK);
 
@@ -1719,6 +1722,8 @@ static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb)
 		mci_writel(host, INTMASK,
 			   (int_mask & ~sdio_int));
 	}
+
+	spin_unlock_bh(&host->lock);
 }
 
 #ifdef CONFIG_MMC_DW_ROCKCHIP_SWITCH_VOLTAGE