summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-23 05:47:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-23 05:47:57 -0700
commit68579162c786bcee634e8eeebe97d0fd5da00e9d (patch)
tree6ab303aef57b1a567de38314c39d609f57d920c8
parent0267b3cfacc144be45ea4c7d1dd49e8f1bbffba9 (diff)
parentbb91db920155537f249a49da4d09d914d49f59cb (diff)
Merge "msm: camera: isp: Initialize the isp clock index before enable"
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp47.c1
1 files changed, 1 insertions, 0 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 6716bb6caad6..70950a88fc66 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
@@ -2561,6 +2561,7 @@ int msm_vfe47_get_clks(struct vfe_device *vfe_dev)
if (rc)
return rc;
+ vfe_dev->num_norm_clk = vfe_dev->num_clk;
for (i = 0; i < vfe_dev->num_clk; i++) {
if (strcmp(vfe_dev->vfe_clk_info[i].clk_name,
"camss_vfe_stream_clk") == 0) {