diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-30 16:04:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-30 16:04:33 -0700 |
| commit | 6cec3ff5ebf94071c991cc350fbb42fab028a306 (patch) | |
| tree | 11be7b0382e008826746e3c113a2f6bab4876e00 | |
| parent | 1ad752ad89f75bc1d40f2e989b7c328060846ecd (diff) | |
| parent | 34af16a207a53deb6c04402d8119475a9dd77fcc (diff) | |
Merge "ais: always do clock set_rate after get_rate"
| -rw-r--r-- | drivers/media/platform/msm/ais/common/cam_soc_api.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/platform/msm/ais/common/cam_soc_api.c b/drivers/media/platform/msm/ais/common/cam_soc_api.c index 09d470ed6eb0..118d665a44d3 100644 --- a/drivers/media/platform/msm/ais/common/cam_soc_api.c +++ b/drivers/media/platform/msm/ais/common/cam_soc_api.c @@ -379,13 +379,13 @@ int msm_camera_clk_enable(struct device *dev, clk_info[i].clk_name); goto cam_clk_set_err; } - rc = clk_set_rate(clk_ptr[i], - clk_rate); - if (rc < 0) { - pr_err("%s set rate failed\n", - clk_info[i].clk_name); - goto cam_clk_set_err; - } + } + rc = clk_set_rate(clk_ptr[i], + clk_rate); + if (rc < 0) { + pr_err("%s set rate failed\n", + clk_info[i].clk_name); + goto cam_clk_set_err; } } rc = clk_prepare_enable(clk_ptr[i]); |