summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/nvhost_acm.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2014-04-17 21:02:18 +0530
committerSeema Khowala <seemaj@nvidia.com>2014-04-23 14:06:51 -0700
commit431c303ba618c0fdec12214005419ea508126b7c (patch)
treeb37645791850d657e261498782a1e4ce763a648e /drivers/video/tegra/host/nvhost_acm.c
parentc5d85bf5df9b85d6b82b6a7f1224e45af1106836 (diff)
video: tegra: host: fix disable_clk() sequence
nvhost_module_disable_clk() currently first disables the clocks and then suspends the channels as follows : clk_disable_unprepare() nvhost_channel_suspend() reverse this sequence as below and keep clock disabling after the channel operations nvhost_channel_suspend() clk_disable_unprepare() Bug 1497798 Change-Id: Ib157606f5dde0495f90d2fa3bd53e5efd9617a49 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/397699 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
-rw-r--r--drivers/video/tegra/host/nvhost_acm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index d7ba643277b9..7592f6129305 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -762,13 +762,13 @@ int nvhost_module_disable_clk(struct device *dev)
if (!pdata)
return -EINVAL;
- for (index = 0; index < pdata->num_clks; index++)
- clk_disable_unprepare(pdata->clk[index]);
-
for (index = 0; index < pdata->num_channels; index++)
if (pdata->channels[index])
nvhost_channel_suspend(pdata->channels[index]);
+ for (index = 0; index < pdata->num_clks; index++)
+ clk_disable_unprepare(pdata->clk[index]);
+
/* disable parent's clock if required */
if (dev->parent && dev->parent != &platform_bus)
nvhost_module_disable_clk(dev->parent);