summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuresh Mangipudi <smangipudi@nvidia.com>2011-08-04 18:00:28 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:03 -0800
commit75280268e404a13c07457bd68d12f53b18dbf8ce (patch)
tree4eca4ae088856d532ea553cf068440d97a992189
parent23a996ee2c38a8b0d0adf155e5847b7438b667b1 (diff)
tegra: ehci: clock disable
Disable the clock only when the device clocks are enabled. Bug 858490 Original-Change-Id: I2f22890b11ec98b88457ffe6c90411f9927d8390 Reviewed-on: http://git-master/r/45007 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Tested-by: Suresh Mangipudi <smangipudi@nvidia.com> Tested-by: Bala Murali Krishna <balam@nvidia.com> Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com> Rebase-Id: R7a42a8bb412327a2c1d84877d84b722e33092ce9
-rw-r--r--drivers/usb/host/ehci-tegra.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 1bf667a86b50..c10f66ee7e80 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -1162,10 +1162,11 @@ static int tegra_ehci_remove(struct platform_device *pdev)
clk_disable(tegra->clk);
clk_put(tegra->clk);
- clk_disable(tegra->sclk_clk);
+ if (tegra->clock_enabled){
+ clk_disable(tegra->sclk_clk);
+ clk_disable(tegra->emc_clk);
+ }
clk_put(tegra->sclk_clk);
-
- clk_disable(tegra->emc_clk);
clk_put(tegra->emc_clk);
kfree(tegra);