summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShubhraprakash Das <sadas@codeaurora.org>2016-10-14 13:40:14 -0700
committerShubhraprakash Das <sadas@codeaurora.org>2016-10-17 12:34:57 -0700
commitdb1cd0b5221266aa6877e84f4e68d0d5185b40fb (patch)
treec0cc346a036f128c8a628b86c5f3ab67477727ad
parent1fac7f53bdec193dfbaba8a9706075dc4d5ff756 (diff)
msm: camera: isp: Set the clock rate before ahb vote
Set the vfe clock rate before putting the ahb vote into suspend otherwise the clock vote will bump up the ahb vote and prevent shutdown. CRs-Fixed: 1078215 Change-Id: I439ae8aea839af6d9b84fe1384feb18de3d9d276 Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp47.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
index 9a469abc56ca..751c97a0f12b 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
@@ -359,13 +359,13 @@ void msm_vfe47_release_hardware(struct vfe_device *vfe_dev)
else
id = CAM_AHB_CLIENT_VFE1;
+ vfe_dev->hw_info->vfe_ops.platform_ops.set_clk_rate(vfe_dev, &rate);
+
if (cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SUSPEND_VOTE) < 0)
pr_err("%s: failed to vote for AHB\n", __func__);
vfe_dev->ahb_vote = CAM_AHB_SUSPEND_VOTE;
- vfe_dev->hw_info->vfe_ops.platform_ops.set_clk_rate(vfe_dev, &rate);
-
vfe_dev->hw_info->vfe_ops.platform_ops.enable_clks(
vfe_dev, 0);
vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(vfe_dev, 0);