Merge "msm: sensor: fixing errors due to csiphy clock release" (1cfd75d9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1265,7 +1265,7 @@ static const struct v4l2_subdev_ops msm_csiphy_subdev_ops = {
		static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
		struct platform_device *pdev)
		{
		int i, rc;
		int i, rc = 0;
		char *csi_3p_clk_name = "csi_phy_3p_clk";
		char *csi_3p_clk_src_name = "csiphy_3p_clk_src";
		uint32_t clk_cnt = 0;
		@@ -1281,6 +1281,7 @@ static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
		if (csiphy_dev->num_all_clk > CSIPHY_NUM_CLK_MAX) {
		pr_err("%s: invalid count=%zu, max is %d\n", __func__,
		csiphy_dev->num_all_clk, CSIPHY_NUM_CLK_MAX);
		rc = -EINVAL;
		goto MAX_CLK_ERROR;
		}

		@@ -1324,13 +1325,14 @@ static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
		}

		csiphy_dev->num_clk = clk_cnt;
		return rc;
		MAX_CLK_ERROR:
		msm_camera_put_clk_info(csiphy_dev->pdev,
		&csiphy_dev->csiphy_all_clk_info,
		&csiphy_dev->csiphy_all_clk,
		csiphy_dev->num_all_clk);

		return 0;
		return rc;
		}

		static int csiphy_probe(struct platform_device *pdev)