Merge "camera_v2: jpeg_10: Don't enable clock when changing rate"

int msm_jpeg_platform_set_clk_rate(struct msm_jpeg_device *pgmn_dev,

		long clk_rate)

{

	struct msm_cam_clk_info jpeg_core_clk_info[] = {

		{"core_clk", JPEG_CLK_RATE, 0}

	};

	int rc = 0;

	struct clk *jpeg_clk;

	jpeg_core_clk_info[0].clk_rate = clk_rate;

	jpeg_clk = clk_get(&pgmn_dev->pdev->dev, "core_clk");

	if (IS_ERR(jpeg_clk)) {

		JPEG_PR_ERR("%s get failed\n", "core_clk");

		rc = PTR_ERR(jpeg_clk);

		return rc;

	}

	return msm_cam_clk_enable(&pgmn_dev->pdev->dev, jpeg_core_clk_info,

			pgmn_dev->jpeg_clk, ARRAY_SIZE(jpeg_core_clk_info), 1);

	rc = clk_set_rate(jpeg_clk, clk_rate);

	return rc;

}

void msm_jpeg_platform_p2v(struct msm_jpeg_device *pgmn_dev, struct file  *file,