Merge "ais: always do clock set_rate after get_rate" (6cec3ff5) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/ais/common/cam_soc_api.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -379,6 +379,7 @@ 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) {
		@@ -387,7 +388,6 @@ int msm_camera_clk_enable(struct device *dev,
		goto cam_clk_set_err;
		}
		}
		}
		rc = clk_prepare_enable(clk_ptr[i]);
		if (rc < 0) {
		pr_err("%s enable failed\n",