From 9985d031e6021c954d234a9e9363b7fdd044f21a Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Mon, 23 Nov 2009 15:36:31 -0800
Subject: [PATCH] --- yaml --- r: 196687 b: refs/heads/master c:
 f4748499d3dc5e7cadecb977f0d4f1f4f4a8d8c5 h: refs/heads/master i:   196685:
 2c1fa7bd0e05cae081bad17879dc3dcb04e8ce62   196683:
 35414a305a3dcbb292b29a0728b855048f784e56   196679:
 50476a0bd7f1453df70ab0c8da8ad772026085a6   196671:
 0cd373e6002cf27a4da717492ddc1b2590d2aca6 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mmc/host/msm_sdcc.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5d6ccba422be..d48997e23806 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7fc9370df1433486dfa9460a833fae664e8be6c
+refs/heads/master: f4748499d3dc5e7cadecb977f0d4f1f4f4a8d8c5
diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c
index 591ef3c4e9a7..bdafb642a713 100644
--- a/trunk/drivers/mmc/host/msm_sdcc.c
+++ b/trunk/drivers/mmc/host/msm_sdcc.c
@@ -48,6 +48,7 @@
 
 #define DRIVER_NAME "msm-sdcc"
 
+#define BUSCLK_PWRSAVE 0
 #define BUSCLK_TIMEOUT (HZ)
 static unsigned int msmsdcc_fmin = 144000;
 static unsigned int msmsdcc_fmax = 50000000;
@@ -65,6 +66,8 @@ msmsdcc_disable_clocks(struct msmsdcc_host *host, int deferr)
 {
 	WARN_ON(!host->clks_on);
 
+	BUG_ON(host->curr.mrq);
+
 	if (deferr) {
 		mod_timer(&host->busclk_timer, jiffies + BUSCLK_TIMEOUT);
 	} else {
@@ -131,7 +134,9 @@ msmsdcc_request_end(struct msmsdcc_host *host, struct mmc_request *mrq)
 	if (mrq->cmd->error == -ETIMEDOUT)
 		mdelay(5);
 
+#if BUSCLK_PWRSAVE
 	msmsdcc_disable_clocks(host, 1);
+#endif
 	/*
 	 * Need to drop the host lock here; mmc_request_done may call
 	 * back into the driver...
@@ -257,7 +262,9 @@ msmsdcc_dma_complete_func(struct msm_dmov_cmd *cmd,
 			mrq->data->bytes_xfered = host->curr.data_xfered;
 
 			spin_unlock_irqrestore(&host->lock, flags);
+#if BUSCLK_PWRSAVE
 			msmsdcc_disable_clocks(host, 1);
+#endif
 			mmc_request_done(host->mmc, mrq);
 			return;
 		} else
@@ -934,7 +941,9 @@ msmsdcc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		host->pwr = pwr;
 		msmsdcc_writel(host, pwr, MMCIPOWER);
 	}
+#if BUSCLK_PWRSAVE
 	msmsdcc_disable_clocks(host, 1);
+#endif
 	spin_unlock_irqrestore(&host->lock, flags);
 }
 
@@ -1279,7 +1288,9 @@ msmsdcc_probe(struct platform_device *pdev)
 	if (host->timer.function)
 		pr_info("%s: Polling status mode enabled\n", mmc_hostname(mmc));
 
+#if BUSCLK_PWRSAVE
 	msmsdcc_disable_clocks(host, 1);
+#endif
 	return 0;
  cmd_irq_free:
 	free_irq(cmd_irqres->start, host);
@@ -1341,7 +1352,9 @@ msmsdcc_resume(struct platform_device *dev)
 			mmc_resume_host(mmc);
 		if (host->stat_irq)
 			enable_irq(host->stat_irq);
+#if BUSCLK_PWRSAVE
 		msmsdcc_disable_clocks(host, 1);
+#endif
 	}
 	return 0;
 }