summaryrefslogtreecommitdiff
path: root/drivers/media/video/tegra/nvavp/nvavp_dev.c
diff options
context:
space:
mode:
authorMandar Potdar <mpotdar@nvidia.com>2011-12-06 16:25:07 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-08 18:04:00 +0530
commit8b0fbf761949f6a5b84affa1e1974b5595b5c176 (patch)
tree0bad049d001c7e7ebfe8c99f08efeeb0db146ccb /drivers/media/video/tegra/nvavp/nvavp_dev.c
parenta918cba66ec237c1018295cdd6669575b9314fcb (diff)
nvavp: Enable clock before clk_set_rate/clk_get_rate
Explicitly enable clock before doing clk_set_rate() or clk_get_rate(). It is possible that the clock was disabled due to idle notification from AVP. bug: 904969 bug: 876317 Signed-off-by: Mandar Potdar <mpotdar@nvidia.com> Change-Id: I100589d4f45244a9db3c05954ff9c9dabb62c0ed Reviewed-on: http://git-master/r/68438 Reviewed-by: Mohan Nimaje <mnimaje@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Mandar Potdar <mpotdar@nvidia.com> Reviewed-by: Jihoon Bang <jbang@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/media/video/tegra/nvavp/nvavp_dev.c')
-rw-r--r--drivers/media/video/tegra/nvavp/nvavp_dev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c
index 91443faa8b34..03107164d114 100644
--- a/drivers/media/video/tegra/nvavp/nvavp_dev.c
+++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c
@@ -797,10 +797,11 @@ static int nvavp_set_clock_ioctl(struct file *filp, unsigned int cmd,
if (IS_ERR_OR_NULL(c))
return -EINVAL;
+ clk_enable(c);
clk_set_rate(c, config.rate);
config.rate = clk_get_rate(c);
-
+ clk_disable(c);
if (copy_to_user((void __user *)arg, &config, sizeof(struct nvavp_clock_args)))
return -EFAULT;
@@ -822,7 +823,9 @@ static int nvavp_get_clock_ioctl(struct file *filp, unsigned int cmd,
if (IS_ERR_OR_NULL(c))
return -EINVAL;
+ clk_enable(c);
config.rate = clk_get_rate(c);
+ clk_disable(c);
if (copy_to_user((void __user *)arg, &config, sizeof(struct nvavp_clock_args)))
return -EFAULT;