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>
Rebase-Id: R509404c1170255a6b54d9fba78299dbaf63d4807

diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c
index e52fd018e81cf176983b64eff809090b7e3a1ed2..f061591317748006a8202376f0def5cd2fc1f1d8 100644 (file)
--- a/drivers/media/video/tegra/tegra_camera.c
+++ b/drivers/media/video/tegra/tegra_camera.c
@@ -102,17 +102,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)