diff options
| author | Sang-Hun Lee <sanlee@nvidia.com> | 2012-06-20 18:33:59 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-07-01 08:10:13 -0700 |
| commit | ba54fa36141c98dd7f1a4ce845f89633715e62a5 (patch) | |
| tree | 5a0955ce3291e676d81ad5365d9815ed8dc1ffac /drivers/media/video | |
| parent | 0a7572c38c979aec2caeeea12eec1dd52c4bc265 (diff) | |
media: video: tegra: tegra_camera: disable eack
- Disable eack when a camera is in use
Bug 995950
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-on: http://git-master/r/110224
(cherry picked from commit f336812516efac8c6445def282340333094973c9)
Change-Id: I9a5ee84dc48bacf88261b0bf3180fe69fea3712f
Reviewed-on: http://git-master/r/110979
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Tested-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/tegra/tegra_camera.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c index 5c1cbfe63a28..03eecf464c48 100644 --- a/drivers/media/video/tegra/tegra_camera.c +++ b/drivers/media/video/tegra/tegra_camera.c @@ -96,17 +96,18 @@ static int tegra_camera_disable_clk(struct tegra_camera_dev *dev) static int tegra_camera_enable_emc(struct tegra_camera_dev *dev) { + int ret = tegra_emc_disable_eack(); clk_enable(dev->emc_clk); #ifdef CONFIG_ARCH_TEGRA_2x_SOC clk_set_rate(dev->emc_clk, 300000000); #endif - return 0; + return ret; } static int tegra_camera_disable_emc(struct tegra_camera_dev *dev) { clk_disable(dev->emc_clk); - return 0; + return tegra_emc_enable_eack(); } static int tegra_camera_clk_set_rate(struct tegra_camera_dev *dev) |